From 4879b8f2924b1768d23f627e643ce8893246ad0e Mon Sep 17 00:00:00 2001
From: Thomas Juerges <4-jurges@users.noreply.git.astron.nl>
Date: Tue, 18 May 2021 08:39:46 +0200
Subject: [PATCH] L2SS-218 Remove mounting SKA dirs
---
bootstrap/etc/lofar20rc.sh | 10 +---------
docker-compose/Makefile | 1 -
docker-compose/archiver.yml | 1 -
docker-compose/itango.yml | 1 -
docker-compose/jive.yml | 3 +--
docker-compose/jupyter.yml | 1 -
docker-compose/pogo.yml | 1 -
7 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/bootstrap/etc/lofar20rc.sh b/bootstrap/etc/lofar20rc.sh
index 9cccdceb4..1e9efc4a3 100755
--- a/bootstrap/etc/lofar20rc.sh
+++ b/bootstrap/etc/lofar20rc.sh
@@ -11,14 +11,6 @@
export LOFAR20_DIR=${1:-${PWD}}
echo "Setting LOFAR20_DIR=${LOFAR20_DIR}"
-# This needs to be modified for a development environment.
-# Example: ~/lofar2.0/
-# The current setting is for a production environment.
-export TANGO_SKA_LOCAL_DIR=${LOFAR20_DIR}
-
-export TANGO_SKA_CONTAINER_DIR=${LOFAR20_DIR}/ska-docker/
-export TANGO_SKA_CONTAINER_MOUNT=${TANGO_SKA_LOCAL_DIR}:${TANGO_SKA_CONTAINER_DIR}:ro
-
# This needs to be modified for a development environment.
# Example: ~/lofar2.0/tango
@@ -44,7 +36,7 @@ export TANGO_HOST=$(hostname):10000
#
# Provide the -v parameters for Docker and the -e ENV variables.
-export TANGO_CONTAINER_ENV="-e TANGO_SKA_CONTAINER_DIR=${TANGO_SKA_CONTAINER_DIR} -e TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR}"
+export TANGO_CONTAINER_ENV="-e TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR}"
# Remove all LOFAR1 related environment modifications
function remove_lofar()
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index f1b2cc578..1b7983ed1 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -101,7 +101,6 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
TANGO_HOST=$(TANGO_HOST) \
NETWORK_MODE=$(NETWORK_MODE) \
XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) \
- TANGO_SKA_CONTAINER_MOUNT=$(TANGO_SKA_CONTAINER_MOUNT) \
TANGO_LOFAR_CONTAINER_MOUNT=$(TANGO_LOFAR_CONTAINER_MOUNT) \
TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR} MYSQL_HOST=$(MYSQL_HOST) \
CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) \
diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index f471de628..98200f610 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -63,7 +63,6 @@ services:
json2tango -w -a -u /tango-archiver/data/archiver-devices.json &&
sleep infinity"
volumes:
- - ${TANGO_SKA_CONTAINER_MOUNT}
- ${TANGO_LOFAR_CONTAINER_MOUNT}
- ${HOME}:/hosthome
- ../docker/tango/tango-archiver:/tango-archiver
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index d131d4053..4c12fe3a0 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -21,7 +21,6 @@ services:
container_name: ${CONTAINER_NAME_PREFIX}itango
network_mode: ${NETWORK_MODE}
volumes:
- - ${TANGO_SKA_CONTAINER_MOUNT}
- ${TANGO_LOFAR_CONTAINER_MOUNT}
- ${HOME}:/hosthome
environment:
diff --git a/docker-compose/jive.yml b/docker-compose/jive.yml
index 5148d1d15..d3b8b06f9 100644
--- a/docker-compose/jive.yml
+++ b/docker-compose/jive.yml
@@ -3,7 +3,7 @@
# display.
#
# This container will always run on the same network as the host,
-# to make sure the DISPLAY variable can be used verbatim. For the
+# to make sure the DISPLAY variable can be used verbatim. For the
# same reason, TANGO_HOST is hardcoded to be at localhost:10000:
# the docker network offering our tangodb also exposes it on port 10000
# on the host.
@@ -23,7 +23,6 @@ services:
network_mode: host
volumes:
- ${XAUTHORITY_MOUNT}
- - ${TANGO_SKA_CONTAINER_MOUNT}
- ${TANGO_LOFAR_CONTAINER_MOUNT}
- ${HOME}:/hosthome
environment:
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index dbabfadba..0ac641b22 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -18,7 +18,6 @@ services:
container_name: ${CONTAINER_NAME_PREFIX}jupyter
network_mode: ${NETWORK_MODE}
volumes:
- - ${TANGO_SKA_CONTAINER_MOUNT}
- ${TANGO_LOFAR_CONTAINER_MOUNT}
- ${TANGO_LOFAR_LOCAL_DIR}/jupyter-notebooks:/jupyter-notebooks:rw
- ${HOME}:/hosthome
diff --git a/docker-compose/pogo.yml b/docker-compose/pogo.yml
index c9770ca7b..9e2d377c1 100644
--- a/docker-compose/pogo.yml
+++ b/docker-compose/pogo.yml
@@ -26,7 +26,6 @@ services:
volumes:
- pogo:/home/tango
- ${XAUTHORITY_MOUNT}
- - ${TANGO_SKA_CONTAINER_MOUNT}
- ${TANGO_LOFAR_CONTAINER_MOUNT}
- ${HOME}:/hosthome:rw
environment:
--
GitLab