Skip to content
Snippets Groups Projects
Commit 0cfee653 authored by Stefano Di Frischia's avatar Stefano Di Frischia
Browse files

Merge branch 'master' into L2SS-970-add-loki-instance

parents 94903f8c 23a3205a
Branches
Tags
1 merge request!447Resolve L2SS-970 "Add loki instance"
Showing
with 41 additions and 1 deletion
......@@ -46,4 +46,6 @@ fi
# docker-compose files.
cd "$CWD" || exit 1
/usr/local/bin/wait-for-it.sh "$TANGO_HOST" --timeout=30 --strict -- "$@"
# Replace this script's process with the actual command, allowing any signals
# send to the bash PID to be sent to the command directly.
exec /usr/local/bin/wait-for-it.sh "$TANGO_HOST" --timeout=30 --strict -- "$@"
......@@ -50,3 +50,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-antennafield AntennaField STAT -v -ORBendPoint giop:tcp:0:5715 -ORBendPointPublish giop:tcp:${HOSTNAME}:5715
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-apsct Apsct STAT -v -v -ORBendPoint giop:tcp:device-apsct:5709 -ORBendPointPublish giop:tcp:${HOSTNAME}:5709
restart: on-failure
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-apspu Apspu STAT -v -ORBendPoint giop:tcp:device-apspu:5710 -ORBendPointPublish giop:tcp:${HOSTNAME}:5710
restart: on-failure
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-beamlet Beamlet STAT -v -ORBendPoint giop:tcp:0:5712 -ORBendPointPublish giop:tcp:${HOSTNAME}:5712
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -48,3 +48,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-boot Boot STAT -v -ORBendPoint giop:tcp:0:5708 -ORBendPointPublish giop:tcp:${HOSTNAME}:5708
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -52,3 +52,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-bst BST STAT -v -ORBendPoint giop:tcp:0:5717 -ORBendPointPublish giop:tcp:${HOSTNAME}:5717
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-ccd Ccd STAT -v -ORBendPoint giop:tcp:device-ccd:5721 -ORBendPointPublish giop:tcp:${HOSTNAME}:5721
restart: on-failure
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-digitalbeam DigitalBeam STAT -v -ORBendPoint giop:tcp:0:5713 -ORBendPointPublish giop:tcp:${HOSTNAME}:5713
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -51,3 +51,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-docker-device Docker STAT -v -ORBendPoint giop:tcp:0:5705 -ORBendPointPublish giop:tcp:${HOSTNAME}:5705
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -48,3 +48,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-observation-control ObservationControl STAT -v -ORBendPoint giop:tcp:0:5703 -ORBendPointPublish giop:tcp:${HOSTNAME}:5703
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -47,3 +47,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-observation Observation STAT -v -ORBendPoint giop:tcp:0:5718 -ORBendPointPublish giop:tcp:${HOSTNAME}:5718
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -44,3 +44,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-pcon pcon STAT -v -ORBendPoint giop:tcp:device-pcon:5720 -ORBendPointPublish giop:tcp:${HOSTNAME}:5720
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -44,3 +44,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-psoc PSOC STAT -v -ORBendPoint giop:tcp:device-psoc:5719 -ORBendPointPublish giop:tcp:${HOSTNAME}:5719
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-receiver RECV STAT -v -ORBendPoint giop:tcp:device-recv:5707 -ORBendPointPublish giop:tcp:${HOSTNAME}:5707
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-sdp SDP STAT -v -ORBendPoint giop:tcp:device-sdp:5701 -ORBendPointPublish giop:tcp:${HOSTNAME}:5701
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -52,3 +52,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-sst SST STAT -v -ORBendPoint giop:tcp:0:5702 -ORBendPointPublish giop:tcp:${HOSTNAME}:5702
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -44,3 +44,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-temperature-manager TemperatureManager STAT -v -ORBendPoint giop:tcp:0:5716 -ORBendPointPublish giop:tcp:${HOSTNAME}:5716
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -45,3 +45,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-tilebeam TileBeam STAT -v -ORBendPoint giop:tcp:0:5711 -ORBendPointPublish giop:tcp:${HOSTNAME}:5711
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
......@@ -49,3 +49,5 @@ services:
# can't know about our Docker port forwarding
- l2ss-unb2 UNB2 STAT -v -ORBendPoint giop:tcp:device-unb2:5704 -ORBendPointPublish giop:tcp:${HOSTNAME}:5704
restart: unless-stopped
stop_signal: SIGINT # request a graceful shutdown of Tango
stop_grace_period: 2s
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment