Merge branch 'master' into '2021-03-16-Branched_from_master-ELK-stack'

# Conflicts:
#   docker-compose/lofar-device-base/Dockerfile
Merge conflict due to additional sudo

docker-compose/Makefile

@@ -82,7 +82,7 @@ endif
 
 DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) XAUTHORITY=$(XAUTHORITY) 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) COMPOSE_IGNORE_ORPHANS=true
+		CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) COMPOSE_IGNORE_ORPHANS=true CONTAINER_EXECUTION_UID=$(shell id -u)
 
 
 .PHONY: up down minimal start stop status clean pull help

docker-compose/archiver.yml

@@ -67,4 +67,5 @@ services:
       - ${TANGO_LOFAR_CONTAINER_MOUNT}
       - ${HOME}:/hosthome
       - ../docker/tango/tango-archiver:/tango-archiver
+    restart: on-failure
 

docker-compose/device-pcc.yml

@@ -21,6 +21,7 @@ services:
         - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    user: ${CONTAINER_EXECUTION_UID}
     entrypoint:
       - /usr/local/bin/wait-for-it.sh
       - ${TANGO_HOST}

docker-compose/device-sdp.yml

@@ -21,6 +21,7 @@ services:
         - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    user: ${CONTAINER_EXECUTION_UID}
     entrypoint:
       - /usr/local/bin/wait-for-it.sh
       - ${TANGO_HOST}

docker-compose/itango.yml

@@ -28,6 +28,7 @@ services:
       - TANGO_HOST=${TANGO_HOST}
       - XAUTHORITY=${XAUTHORITY}
       - DISPLAY=${DISPLAY}
+    user: ${CONTAINER_EXECUTION_UID}
     stdin_open: true
     tty: true
     entrypoint:

docker-compose/itango/Dockerfile

@@ -8,8 +8,8 @@ RUN sudo apt-get -y update && \
     sudo apt-get -y install apt-file apt-transport-https apt-utils aptitude && \
     sudo aptitude -y install htop iftop iproute2 mc most net-tools tcpdump telnet tmux traceroute vim xterm && \
     sudo aptitude clean && \
-    sudo aptitude autoclean && \
-    sudo pip3 install "opcua >= 0.98.9" asyncua astropy && \
-    sudo pip3 uninstall -y jedi parso && \
-    sudo pip3 install "parso == 0.7.1" "jedi == 0.17.2" && \
+    sudo aptitude autoclean
+
+COPY lofar-requirements.txt /lofar-requirements.txt
+RUN sudo pip3 install -r /lofar-requirements.txt && \
     sudo pip3 cache purge

docker-compose/itango/lofar-requirements.txt

+parso == 0.7.1
+jedi == 0.17.2
+opcua >= 0.98.9
+asyncua
+astropy 

docker-compose/jupyter.yml

@@ -26,6 +26,7 @@ services:
       - DISPLAY=${DISPLAY}
     ports:
       - "8888:8888"
+    user: ${CONTAINER_EXECUTION_UID}
     working_dir: /jupyter-notebooks
     entrypoint:
       - /usr/local/bin/wait-for-it.sh

docker-compose/jupyter/Dockerfile

@@ -8,8 +8,8 @@ RUN sudo pip3 install jupyter_bokeh
 # Configure jupyter_bokeh
 RUN sudo mkdir -p /usr/share/jupyter /usr/etc
 RUN sudo chmod a+rwx /usr/share/jupyter /usr/etc
-RUN jupyter nbextension install --sys-prefix --symlink --py jupyter_bokeh
-RUN jupyter nbextension enable jupyter_bokeh --py --sys-prefix
+RUN sudo jupyter nbextension install --sys-prefix --symlink --py jupyter_bokeh
+RUN sudo jupyter nbextension enable jupyter_bokeh --py --sys-prefix
 
 # Install profiles for ipython & jupyter
 COPY ipython-profiles /opt/ipython-profiles/
@@ -22,5 +22,6 @@ COPY jupyter-notebook /usr/local/bin/jupyter-notebook
 
 # Add Tini. Tini operates as a process subreaper for jupyter. This prevents kernel crashes.
 ENV TINI_VERSION v0.6.0
+ENV JUPYTER_RUNTIME_DIR=/tmp
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
 RUN sudo chmod +x /usr/bin/tini

docker-compose/lofar-device-base/Dockerfile

 FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:latest
 
 COPY lofar-requirements.txt /lofar-requirements.txt
-RUN pip3 install -r /lofar-requirements.txt
+RUN sudo pip3 install -r /lofar-requirements.txt
 
 ENV TANGO_LOG_PATH=/var/log/tango
 RUN sudo mkdir -p /var/log/tango && sudo chmod a+rwx /var/log/tango