From 9560938c8969edbde7ebebfd23caf1643a594d8e Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 16 Mar 2021 17:28:27 +0100
Subject: [PATCH] Removed use of SOURCE_IMAGE in FROM field in Dockerfile as
older dockers dont support it, removed partial 'lofar' naming scheme in
containers & images
---
docker-compose/itango.yml | 2 +-
docker-compose/{lofar-itango => itango}/Dockerfile | 0
docker-compose/{lofar-jupyter.yml => jupyter.yml} | 4 +---
docker-compose/{lofar-jupyter => jupyter}/Dockerfile | 2 +-
.../ipython-profiles/stationcontrol-jupyter/ipython_config.py | 0
.../stationcontrol-jupyter/startup/00-tango.py | 0
.../ipython-profiles/stationcontrol-jupyter/startup/README | 0
.../jupyter-kernels/stationcontrol/kernel.json | 0
8 files changed, 3 insertions(+), 5 deletions(-)
rename docker-compose/{lofar-itango => itango}/Dockerfile (100%)
rename docker-compose/{lofar-jupyter.yml => jupyter.yml} (88%)
rename docker-compose/{lofar-jupyter => jupyter}/Dockerfile (93%)
rename docker-compose/{lofar-jupyter => jupyter}/ipython-profiles/stationcontrol-jupyter/ipython_config.py (100%)
rename docker-compose/{lofar-jupyter => jupyter}/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py (100%)
rename docker-compose/{lofar-jupyter => jupyter}/ipython-profiles/stationcontrol-jupyter/startup/README (100%)
rename docker-compose/{lofar-jupyter => jupyter}/jupyter-kernels/stationcontrol/kernel.json (100%)
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index a5fe11565..ef825b5c2 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -15,7 +15,7 @@ version: '2'
services:
itango:
build:
- context: lofar-itango
+ context: itango
args:
SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:latest
container_name: ${CONTAINER_NAME_PREFIX}itango
diff --git a/docker-compose/lofar-itango/Dockerfile b/docker-compose/itango/Dockerfile
similarity index 100%
rename from docker-compose/lofar-itango/Dockerfile
rename to docker-compose/itango/Dockerfile
diff --git a/docker-compose/lofar-jupyter.yml b/docker-compose/jupyter.yml
similarity index 88%
rename from docker-compose/lofar-jupyter.yml
rename to docker-compose/jupyter.yml
index a7406773f..1a690384f 100644
--- a/docker-compose/lofar-jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -15,9 +15,7 @@ version: '2'
services:
jupyter:
build:
- context: lofar-jupyter
- args:
- SOURCE_IMAGE: lofar-itango:latest
+ context: jupyter
container_name: ${CONTAINER_NAME_PREFIX}jupyter
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/lofar-jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
similarity index 93%
rename from docker-compose/lofar-jupyter/Dockerfile
rename to docker-compose/jupyter/Dockerfile
index 849f5ff3a..96fbec498 100644
--- a/docker-compose/lofar-jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -1,5 +1,5 @@
ARG VERSION=latest
-FROM lofar-itango:${VERSION}
+FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:${VERSION}
RUN pip3 install jupyter
RUN pip3 install ipykernel
diff --git a/docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/ipython_config.py b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/ipython_config.py
similarity index 100%
rename from docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/ipython_config.py
rename to docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/ipython_config.py
diff --git a/docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py
similarity index 100%
rename from docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py
rename to docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/00-tango.py
diff --git a/docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/startup/README b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/README
similarity index 100%
rename from docker-compose/lofar-jupyter/ipython-profiles/stationcontrol-jupyter/startup/README
rename to docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/README
diff --git a/docker-compose/lofar-jupyter/jupyter-kernels/stationcontrol/kernel.json b/docker-compose/jupyter/jupyter-kernels/stationcontrol/kernel.json
similarity index 100%
rename from docker-compose/lofar-jupyter/jupyter-kernels/stationcontrol/kernel.json
rename to docker-compose/jupyter/jupyter-kernels/stationcontrol/kernel.json
--
GitLab