From f1191d771b3e62518595aa82710c716c586ff87f Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Wed, 14 Sep 2022 16:17:46 +0200
Subject: [PATCH] L2SS-751: expose zmq ports on device servers

---
 docker-compose/device-docker.yml              | 4 ++++
 docker-compose/device-observation-control.yml | 4 ++++
 docker-compose/device-sdp.yml                 | 4 ++++
 docker-compose/device-sst.yml                 | 4 ++++
 docker-compose/device-unb2.yml                | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/docker-compose/device-docker.yml b/docker-compose/device-docker.yml
index db33c9aed..c531ac63b 100644
--- a/docker-compose/device-docker.yml
+++ b/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
diff --git a/docker-compose/device-observation-control.yml b/docker-compose/device-observation-control.yml
index 7025b8b3a..42b9e48a9 100644
--- a/docker-compose/device-observation-control.yml
+++ b/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
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 144630c88..61f8eb341 100644
--- a/docker-compose/device-sdp.yml
+++ b/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
diff --git a/docker-compose/device-sst.yml b/docker-compose/device-sst.yml
index e6b0edb75..5db68a00c 100644
--- a/docker-compose/device-sst.yml
+++ b/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
diff --git a/docker-compose/device-unb2.yml b/docker-compose/device-unb2.yml
index 2c05d6e66..cbb31b0ef 100644
--- a/docker-compose/device-unb2.yml
+++ b/docker-compose/device-unb2.yml
@@ -32,12 +32,16 @@ services:
       - control
     ports:
       - "5704:5704" # unique port for this DS
+      - "5804:5804" # ZeroMQ event port
+      - "5904:5904" # ZeroMQ heartbeat port
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+      - TANGO_ZMQ_EVENT_PORT=5804
+      - TANGO_ZMQ_HEARTBEAT_PORT=5904
     working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh
-- 
GitLab