Merge branch 'master' into L2SS-822-cache-archiver-ts-docker-image

.gitlab-ci.yml

@@ -527,7 +527,8 @@ xenon:
 shellcheck:
   stage: static-analysis
   script:
-#     TODO(Corne): Ignore shell files in submodules
+#     TODO(Corne): L2SS-962: Ignore shell files in submodules
+    - shellcheck --version
     - shellcheck **/*.sh
 sphinx-documentation:
   stage: documentation

docker-compose/.env

@@ -9,7 +9,7 @@ TANGO_CPP_VERSION=9.3.9
 TANGO_DB_VERSION=10.4.14
 TANGO_DSCONFIG_VERSION=1.5.3
 TANGO_HDBPP_VIEWER_VERSION=2021-05-28
-TANGO_ITANGO_VERSION=9.3.7
+TANGO_ITANGO_VERSION=9.3.9
 TANGO_JAVA_VERSION=9.3.6
 TANGO_POGO_VERSION=9.6.34
 TANGO_REST_VERSION=1.14.6

docker-compose/device-antennafield.yml

@@ -33,12 +33,16 @@ services:
       - control
     ports:
       - "5715:5715" # unique port for this DS
+      - "5815:5815" # ZeroMQ event port
+      - "5915:5915" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5815
+      - TANGO_ZMQ_HEARTBEAT_PORT=5915
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-apsct.yml

@@ -32,12 +32,16 @@ services:
       - control
     ports:
       - "5709:5709" # unique port for this DS
+      - "5809:5809" # ZeroMQ event port
+      - "5909:5909" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5809
+      - TANGO_ZMQ_HEARTBEAT_PORT=5909
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-apspu.yml

@@ -32,12 +32,16 @@ services:
       - control
     ports:
       - "5710:5710" # unique port for this DS
+      - "5810:5810" # ZeroMQ event port
+      - "5910:5910" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5810
+      - TANGO_ZMQ_HEARTBEAT_PORT=5910
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-beamlet.yml

@@ -32,12 +32,16 @@ services:
       - control
     ports:
       - "5712:5712" # unique port for this DS
+      - "5812:5812" # ZeroMQ event port
+      - "5912:5912" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5812
+      - TANGO_ZMQ_HEARTBEAT_PORT=5912
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-boot.yml

@@ -31,12 +31,16 @@ services:
       - control
     ports:
       - "5708:5708" # unique port for this DS
+      - "5808:5808" # ZeroMQ event port
+      - "5908:5908" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
       - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5808
+      - TANGO_ZMQ_HEARTBEAT_PORT=5908
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-bst.yml

@@ -35,12 +35,16 @@ services:
         - "5003:5003/udp" # port to receive SST UDP packets on
         - "5103:5103/tcp" # port to emit SST TCP packets on
         - "5717:5717" # unique port for this DS
+        - "5817:5817" # ZeroMQ event port
+        - "5917:5917" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5817
+      - TANGO_ZMQ_HEARTBEAT_PORT=5917
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-ccd.yml

@@ -32,12 +32,16 @@ services:
       - control
     ports:
       - "5721:5721" # unique port for this DS
+      - "5821:5821" # ZeroMQ event port
+      - "5921:5921" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5821
+      - TANGO_ZMQ_HEARTBEAT_PORT=5921
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-digitalbeam.yml

@@ -32,12 +32,16 @@ services:
       - control
     ports:
       - "5713:5713" # unique port for this DS
+      - "5813:5813" # ZeroMQ event port
+      - "5913:5913" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5813
+      - TANGO_ZMQ_HEARTBEAT_PORT=5913
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-docker.yml

@@ -32,6 +32,8 @@ services:
       - control
     ports:
       - "5705:5705" # unique port for this DS
+      - "5805:5805" # ZeroMQ event port
+      - "5905:5905" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
@@ -40,6 +42,8 @@ services:
     user: 1000:${DOCKER_GID} # uid 1000 is the default "tango" user
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5805
+      - TANGO_ZMQ_HEARTBEAT_PORT=5905
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-observation-control.yml

@@ -31,12 +31,16 @@ services:
       - control
     ports:
       - "5703:5703" # unique port for this DS
+      - "5803:5803" # ZeroMQ event port
+      - "5903:5903" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5803
+      - TANGO_ZMQ_HEARTBEAT_PORT=5903
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-observation.yml

@@ -30,12 +30,16 @@ services:
       - control
     ports:
       - "5718:5718" # unique port for this DS
+      - "5818:5818" # ZeroMQ event port
+      - "5918:5918" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5818
+      - TANGO_ZMQ_HEARTBEAT_PORT=5918
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-pcon.yml

@@ -27,12 +27,16 @@ services:
       - control
     ports:
       - "5720:5720" # unique port for this DS
+      - "5820:5820" # ZeroMQ event port
+      - "5920:5920" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
       - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5820
+      - TANGO_ZMQ_HEARTBEAT_PORT=5920
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-psoc.yml

@@ -27,12 +27,16 @@ services:
       - control
     ports:
       - "5719:5719" # unique port for this DS
+      - "5819:5819" # ZeroMQ event port
+      - "5919:5919" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
       - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5819
+      - TANGO_ZMQ_HEARTBEAT_PORT=5919
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-recv.yml

@@ -32,12 +32,16 @@ services:
       - control
     ports:
       - "5707:5707" # unique port for this DS
+      - "5807:5807" # ZeroMQ event port
+      - "5907:5907" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5807
+      - TANGO_ZMQ_HEARTBEAT_PORT=5907
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-sdp.yml

@@ -32,12 +32,16 @@ services:
       - control
     ports:
       - "5701:5701" # unique port for this DS
+      - "5801:5801" # ZeroMQ event port
+      - "5901:5901" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5801
+      - TANGO_ZMQ_HEARTBEAT_PORT=5901
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-sst.yml

@@ -35,12 +35,16 @@ services:
         - "5001:5001/udp" # port to receive SST UDP packets on
         - "5101:5101/tcp" # port to emit SST TCP packets on
         - "5702:5702" # unique port for this DS
+        - "5802:5802" # ZeroMQ event port
+        - "5902:5902" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5802
+      - TANGO_ZMQ_HEARTBEAT_PORT=5902
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-temperature-manager.yml

@@ -27,12 +27,16 @@ services:
       - control
     ports:
       - "5716:5716" # unique port for this DS
+      - "5816:5816" # ZeroMQ event port
+      - "5916:5916" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
       - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5816
+      - TANGO_ZMQ_HEARTBEAT_PORT=5916
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh

docker-compose/device-tilebeam.yml

@@ -27,6 +27,8 @@ services:
       - control
     ports:
       - "5711:5711" # unique port for this DS
+      - "5811:5811" # ZeroMQ event port
+      - "5911:5911" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
@@ -34,6 +36,8 @@ services:
       - iers-data:/opt/IERS
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5811
+      - TANGO_ZMQ_HEARTBEAT_PORT=5911
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh