From ca7aa3a8682f5902607258fabe31979f73313093 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 3 Jun 2021 12:41:59 +0200
Subject: [PATCH] L2SS-251: Moved SKA repo from nexus.engageska-portugal.pt to
artefact.skatelescope.org
---
bin/start-jive.sh | 2 +-
docker-compose/.env | 4 ++--
docker-compose/itango/Dockerfile | 6 +++---
docker-compose/jupyter/Dockerfile | 4 ++--
docker-compose/lofar-device-base/Dockerfile | 3 ++-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/bin/start-jive.sh b/bin/start-jive.sh
index 06fa7e09a..fcbb9f8b5 100755
--- a/bin/start-jive.sh
+++ b/bin/start-jive.sh
@@ -28,7 +28,7 @@ else
fi
#docker run --rm -it --network host ${OPTIONS} nexus.engageska-portugal.pt/ska-docker/tango-java:latest ${command} ${@}
-container_name=nexus.engageska-portugal.pt/ska-docker/tango-java:latest
+container_name=artefact.skatelescope.org/ska-tango-images/tango-java:9.3.3.2
container=$(docker ps | egrep ${container_name} | cut -d' ' -f1)
if [ ! -z ${container} ]; then
docker exec -it ${container} ${command} ${@}
diff --git a/docker-compose/.env b/docker-compose/.env
index bf415f70a..c46981dca 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -1,2 +1,2 @@
-DOCKER_REGISTRY_HOST=nexus.engageska-portugal.pt
-DOCKER_REGISTRY_USER=ska-docker
+DOCKER_REGISTRY_HOST=artefact.skatelescope.org
+DOCKER_REGISTRY_USER=ska-tango-images
diff --git a/docker-compose/itango/Dockerfile b/docker-compose/itango/Dockerfile
index d0305710b..010d408ba 100644
--- a/docker-compose/itango/Dockerfile
+++ b/docker-compose/itango/Dockerfile
@@ -1,6 +1,6 @@
-ARG VERSION=latest
-ARG DOCKER_REGISTRY_HOST=nexus.engageska-portugal.pt
-ARG DOCKER_REGISTRY_USER=ska-docker
+ARG VERSION=9.3.3.7
+ARG DOCKER_REGISTRY_HOST=artefact.skatelescope.org
+ARG DOCKER_REGISTRY_USER=ska-tango-images
FROM $DOCKER_REGISTRY_HOST/$DOCKER_REGISTRY_USER/tango-itango:${VERSION}
RUN sudo apt-get -y update && \
diff --git a/docker-compose/jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
index 62fb73951..aa1082426 100644
--- a/docker-compose/jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -1,5 +1,5 @@
-ARG VERSION=latest
-FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:${VERSION}
+ARG VERSION=9.3.3.7
+FROM artefact.skatelescope.org/ska-tango-images/tango-itango:${VERSION}
# UID if the user that this container will run under. This is needed to give directories
# that are needed for temporary storage the proper owner and access rights.
diff --git a/docker-compose/lofar-device-base/Dockerfile b/docker-compose/lofar-device-base/Dockerfile
index e0b6efd3d..ddf83de36 100644
--- a/docker-compose/lofar-device-base/Dockerfile
+++ b/docker-compose/lofar-device-base/Dockerfile
@@ -1,4 +1,5 @@
-FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:latest
+ARG VERSION=9.3.3.7
+FROM artefact.skatelescope.org/ska-tango-images/tango-itango:${VERSION}
RUN sudo apt-get update && sudo apt-get install -y git && sudo apt-get clean
--
GitLab