L2SS-218 Remove mounting SKA dirs

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()

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) \

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

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:

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:

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

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: