Skip to content
Snippets Groups Projects
Commit 6c850557 authored by Taya Snijder's avatar Taya Snijder
Browse files

Merge branch 'L2SS-920_make_statistics_writer_tolerant' of...

Merge branch 'L2SS-920_make_statistics_writer_tolerant' of https://git.astron.nl/lofar2.0/tango into L2SS-920_make_statistics_writer_tolerant
parents 85a9f510 301d13bd
Branches
Tags
1 merge request!421Resolve L2SS-920 "Make statistics writer tolerant"
Showing
with 732 additions and 1491 deletions
...@@ -86,11 +86,13 @@ docker_build_image_all: ...@@ -86,11 +86,13 @@ docker_build_image_all:
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh grafana latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh grafana latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh jupyter latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh jupyter latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apsct-sim latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apsct-sim latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh ccd-sim latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apspu-sim latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apspu-sim latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh recv-sim latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh recv-sim latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh sdptr-sim latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh sdptr-sim latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh unb2-sim latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh unb2-sim latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apsct latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apsct latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-ccd latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apspu latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apspu latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-tilebeam latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-tilebeam latest
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-beamlet latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-beamlet latest
...@@ -191,6 +193,17 @@ docker_build_image_apsct_sim: ...@@ -191,6 +193,17 @@ docker_build_image_apsct_sim:
script: script:
# Do not remove 'bash' or statement will be ignored by primitive docker shell # Do not remove 'bash' or statement will be ignored by primitive docker shell
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apsct-sim $tag - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apsct-sim $tag
docker_build_image_ccd_sim:
extends: .base_docker_images_except
only:
refs:
- merge_requests
changes:
- docker-compose/ccd-sim.yml
- docker-compose/pypcc-sim-base/*
script:
# Do not remove 'bash' or statement will be ignored by primitive docker shell
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh ccd-sim $tag
docker_build_image_apspu_sim: docker_build_image_apspu_sim:
extends: .base_docker_images_except extends: .base_docker_images_except
only: only:
...@@ -246,6 +259,17 @@ docker_build_image_device_apsct: ...@@ -246,6 +259,17 @@ docker_build_image_device_apsct:
script: script:
# Do not remove 'bash' or statement will be ignored by primitive docker shell # Do not remove 'bash' or statement will be ignored by primitive docker shell
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-aspct $tag - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-aspct $tag
docker_build_image_device_ccd:
extends: .base_docker_images_except
only:
refs:
- merge_requests
changes:
- docker-compose/device-ccd.yml
- docker-compose/lofar-device-base/*
script:
# Do not remove 'bash' or statement will be ignored by primitive docker shell
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-ccd $tag
docker_build_image_device_apspu: docker_build_image_device_apspu:
extends: .base_docker_images_except extends: .base_docker_images_except
only: only:
...@@ -551,6 +575,7 @@ integration_test_docker: ...@@ -551,6 +575,7 @@ integration_test_docker:
tag="$CI_COMMIT_REF_SLUG" tag="$CI_COMMIT_REF_SLUG"
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag" echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
fi fi
- apk update
- apk add --update make bash docker-compose - apk add --update make bash docker-compose
- apk add --update bind-tools - apk add --update bind-tools
- apk add --update postgresql14-client gzip - apk add --update postgresql14-client gzip
......
...@@ -169,6 +169,16 @@ ...@@ -169,6 +169,16 @@
} }
} }
}, },
"CCD": {
"STAT": {
"CCD": {
"STAT/CCD/1": {
"properties": {
}
}
}
}
},
"APSPU": { "APSPU": {
"STAT": { "STAT": {
"APSPU": { "APSPU": {
......
This diff is collapsed.
...@@ -150,14 +150,14 @@ ...@@ -150,14 +150,14 @@
"RECV_devices": [ "RECV_devices": [
"STAT/RECV/1" "STAT/RECV/1"
], ],
"HBAT_Control_to_RECV_mapping": [ "Control_to_RECV_mapping": [
"1", "24", "1", "24",
"0", "-1", "0", "-1",
"0", "-1", "0", "-1",
"1", "25", "1", "25",
"1", "26" "1", "26"
], ],
"HBAT_Power_to_RECV_mapping": [ "Power_to_RECV_mapping": [
"1", "27", "1", "27",
"0", "-1", "0", "-1",
"0", "-1", "0", "-1",
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
"Antenna_Field_Reference_ETRS": [ "Antenna_Field_Reference_ETRS": [
"3839371.416", "430339.901", "5057958.886" "3839371.416", "430339.901", "5057958.886"
], ],
"HBAT_reference_ETRS": [ "Antenna_Reference_ETRS": [
"3839371.416", "430339.901", "5057958.886", "3839371.416", "430339.901", "5057958.886",
"3839368.919", "430335.979", "5057961.1", "3839368.919", "430335.979", "5057961.1",
"3839365.645", "430339.299", "5057963.288", "3839365.645", "430339.299", "5057963.288",
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"STAT/PCON/1", "STAT/PCON/1",
"STAT/APSPU/1", "STAT/APSPU/1",
"STAT/APSCT/1", "STAT/APSCT/1",
"STAT/CCD/1",
"STAT/RECV/1", "STAT/RECV/1",
"STAT/UNB2/1", "STAT/UNB2/1",
"STAT/SDP/1", "STAT/SDP/1",
...@@ -60,16 +61,16 @@ ...@@ -60,16 +61,16 @@
} }
} }
}, },
"APSPU": { "CCD": {
"STAT": { "STAT": {
"APSPU": { "CCD": {
"STAT/APSPU/1": { "STAT/CCD/1": {
"properties": { "properties": {
"OPC_Server_Name": [ "OPC_Server_Name": [
"10.99.0.100" "10.87.6.67 "
], ],
"OPC_Server_Port": [ "OPC_Server_Port": [
"4842" "4843"
], ],
"OPC_Time_Out": [ "OPC_Time_Out": [
"5.0" "5.0"
...@@ -79,23 +80,29 @@ ...@@ -79,23 +80,29 @@
} }
} }
}, },
"TileBeam": { "APSPU": {
"STAT": { "STAT": {
"TileBeam": { "APSPU": {
"STAT/TileBeam/2": { "STAT/APSPU/1": {
"properties": { "properties": {
"Tracking_enabled_RW_default": [ "OPC_Server_Name": [
"False" "10.99.0.100"
],
"OPC_Server_Port": [
"4842"
],
"OPC_Time_Out": [
"5.0"
] ]
} }
} }
} }
} }
}, },
"DigitalBeam": { "TileBeam": {
"STAT": { "STAT": {
"DigitalBeam": { "TileBeam": {
"STAT/DigitalBeam/1": { "STAT/TileBeam/2": {
"properties": { "properties": {
"Tracking_enabled_RW_default": [ "Tracking_enabled_RW_default": [
"False" "False"
...@@ -168,14 +175,21 @@ ...@@ -168,14 +175,21 @@
"RECV_devices": [ "RECV_devices": [
"STAT/RECV/1" "STAT/RECV/1"
], ],
"HBAT_Control_to_RECV_mapping": [ "Antenna_Names": [
"C0",
"C1",
"C2",
"C3",
"C4"
],
"Control_to_RECV_mapping": [
"1","27", "1","27",
"0","-1", "0","-1",
"0","-1", "0","-1",
"1","28", "1","28",
"1","29" "1","29"
], ],
"HBAT_Power_to_RECV_mapping": [ "Power_to_RECV_mapping": [
"1","24", "1","24",
"0","-1", "0","-1",
"0","-1", "0","-1",
...@@ -185,7 +199,7 @@ ...@@ -185,7 +199,7 @@
"Antenna_Field_Reference_ETRS": [ "Antenna_Field_Reference_ETRS": [
"3839371.416","430339.901","5057958.886" "3839371.416","430339.901","5057958.886"
], ],
"HBAT_reference_ETRS": [ "Antenna_Reference_ETRS": [
"3839371.416","430339.901","5057958.886", "3839371.416","430339.901","5057958.886",
"3839368.919","430335.979","5057961.1", "3839368.919","430335.979","5057961.1",
"3839365.645","430339.299","5057963.288", "3839365.645","430339.299","5057963.288",
...@@ -211,7 +225,18 @@ ...@@ -211,7 +225,18 @@
"RECV_devices": [ "RECV_devices": [
"STAT/RECV/1" "STAT/RECV/1"
], ],
"HBAT_Control_to_RECV_mapping": [ "Antenna_Names": [
"LBA1",
"LBA2",
"LBA3",
"LBA4",
"LBA5",
"LBA6",
"LBA7",
"LBA8",
"LBA9"
],
"Control_to_RECV_mapping": [
"1","1", "1","1",
"1","3", "1","3",
"1","5", "1","5",
...@@ -222,7 +247,7 @@ ...@@ -222,7 +247,7 @@
"1","15", "1","15",
"1","17" "1","17"
], ],
"HBAT_Power_to_RECV_mapping": [ "Power_to_RECV_mapping": [
"1","1", "1","1",
"1","3", "1","3",
"1","5", "1","5",
...@@ -234,9 +259,11 @@ ...@@ -234,9 +259,11 @@
"1","17" "1","17"
], ],
"Antenna_Field_Reference_ETRS": [ "Antenna_Field_Reference_ETRS": [
"3839358.189", "430354.482", "5057967.804" "3839358.189",
"430354.482",
"5057967.804"
], ],
"HBAT_reference_ETRS": [ "Antenna_Reference_ETRS": [
"3839358.189","430354.482","5057967.804", "3839358.189","430354.482","5057967.804",
"3839359.127","430348.074","5057967.607", "3839359.127","430348.074","5057967.607",
"3839360.084","430341.872","5057967.379", "3839360.084","430341.872","5057967.379",
...@@ -302,6 +329,9 @@ ...@@ -302,6 +329,9 @@
"-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1", "-1",
"-1", "-1", "-1", "-1", "-1", "-1" "-1", "-1", "-1", "-1", "-1", "-1"
],
"Tracking_enabled_RW_default": [
"False"
] ]
} }
} }
...@@ -555,7 +585,9 @@ ...@@ -555,7 +585,9 @@
"PSOC": { "PSOC": {
"STAT/PSOC/1": { "STAT/PSOC/1": {
"properties": { "properties": {
"SNMP_host": ["10.87.2.145"], "SNMP_host": [
"10.87.2.145"
],
"PSOC_sockets": [ "PSOC_sockets": [
"ccd_socket", "ccd_socket",
"sdptr0_socket", "sdptr0_socket",
...@@ -576,7 +608,9 @@ ...@@ -576,7 +608,9 @@
"PCON": { "PCON": {
"STAT/PCON/1": { "STAT/PCON/1": {
"properties": { "properties": {
"SNMP_host": ["10.151.225.5"] "SNMP_host": [
"10.151.225.5"
]
} }
} }
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"AntennaField": { "AntennaField": {
"STAT/AntennaField/1": { "STAT/AntennaField/1": {
"properties": { "properties": {
"HBAT_Control_to_RECV_mapping": [ "Control_to_RECV_mapping": [
"1", "0", "1", "0",
"1", "1", "1", "1",
"1", "2", "1", "2",
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
"1", "46", "1", "46",
"1", "47" "1", "47"
], ],
"HBAT_Power_to_RECV_mapping": [ "Power_to_RECV_mapping": [
"1", "48", "1", "48",
"1", "49", "1", "49",
"1", "50", "1", "50",
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
"Antenna_Field_Reference_ETRS": [ "Antenna_Field_Reference_ETRS": [
"3826896.631", "460979.131", "5064657.943" "3826896.631", "460979.131", "5064657.943"
], ],
"HBAT_reference_ETRS": [ "Antenna_Reference_ETRS": [
"3826886.142", "460980.772", "5064665.668", "3826886.142", "460980.772", "5064665.668",
"3826887.237", "460985.643", "5064664.406", "3826887.237", "460985.643", "5064664.406",
"3826889.022", "460974.271", "5064664.094", "3826889.022", "460974.271", "5064664.094",
...@@ -212,16 +212,6 @@ ...@@ -212,16 +212,6 @@
"-0.1195951054", "-0.7919544517", "0.5987530018", "-0.1195951054", "-0.7919544517", "0.5987530018",
" 0.9928227484", "-0.0954186800", "0.0720990002", " 0.9928227484", "-0.0954186800", "0.0720990002",
" 0.0000330969", " 0.6030782884", "0.7976820024" " 0.0000330969", " 0.6030782884", "0.7976820024"
],
"HBAT_Control_to_RECV_mapping": [
"1", "0", "1", "1", "1", "2", "1", "3", "1", "4", "1", "5",
"1", "6", "1", "7", "1", "8", "1", "9", "1", "10", "1", "11",
"1", "12", "1", "13", "1", "14", "1", "15", "1", "16", "1", "17",
"1", "18", "1", "19", "1", "20", "1", "21", "1", "22", "1", "23",
"1", "24", "1", "25", "1", "26", "1", "27", "1", "28", "1", "29",
"1", "30", "1", "31", "1", "32", "1", "33", "1", "34", "1", "35",
"1", "36", "1", "37", "1", "38", "1", "39", "1", "40", "1", "41",
"1", "42", "1", "43", "1", "44", "1", "45", "1", "46", "1", "47"
] ]
} }
} }
......
...@@ -32,6 +32,25 @@ ...@@ -32,6 +32,25 @@
} }
} }
}, },
"CCD": {
"STAT": {
"CCD": {
"STAT/CCD/1": {
"properties": {
"OPC_Server_Name": [
"ccd-sim"
],
"OPC_Server_Port": [
"4843"
],
"OPC_Time_Out": [
"5.0"
]
}
}
}
}
},
"APSPU": { "APSPU": {
"STAT": { "STAT": {
"APSPU": { "APSPU": {
...@@ -125,7 +144,7 @@ ...@@ -125,7 +144,7 @@
"RECV, HBAT_LED_on_RW" "RECV, HBAT_LED_on_RW"
], ],
"Shutdown_Device_List":[ "Shutdown_Device_List":[
"STAT/SDP/1", "STAT/UNB2/1", "STAT/RECV/1", "STAT/APSCT/1", "STAT/APSPU/1" "STAT/SDP/1", "STAT/UNB2/1", "STAT/RECV/1", "STAT/APSCT/1", "STAT/CCD/1","STAT/APSPU/1"
] ]
} }
} }
......
...@@ -37,6 +37,8 @@ else ...@@ -37,6 +37,8 @@ else
rm -rf /tmp/tangostationcontrol rm -rf /tmp/tangostationcontrol
cp -R /opt/lofar/tango/tangostationcontrol /tmp/ cp -R /opt/lofar/tango/tangostationcontrol /tmp/
cd /tmp/tangostationcontrol || exit 1 cd /tmp/tangostationcontrol || exit 1
# Remove the build directory if copied from the source
rm -rf build
pip -vvv install --upgrade --force-reinstall ./ pip -vvv install --upgrade --force-reinstall ./
fi fi
......
...@@ -9,7 +9,7 @@ TANGO_CPP_VERSION=9.3.9 ...@@ -9,7 +9,7 @@ TANGO_CPP_VERSION=9.3.9
TANGO_DB_VERSION=10.4.14 TANGO_DB_VERSION=10.4.14
TANGO_DSCONFIG_VERSION=1.5.3 TANGO_DSCONFIG_VERSION=1.5.3
TANGO_HDBPP_VIEWER_VERSION=2021-05-28 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_JAVA_VERSION=9.3.6
TANGO_POGO_VERSION=9.6.34 TANGO_POGO_VERSION=9.6.34
TANGO_REST_VERSION=1.14.6 TANGO_REST_VERSION=1.14.6
......
...@@ -150,7 +150,8 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \ ...@@ -150,7 +150,8 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) \ CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) \
COMPOSE_IGNORE_ORPHANS=true \ COMPOSE_IGNORE_ORPHANS=true \
CONTAINER_EXECUTION_UID=$(shell id -u) \ CONTAINER_EXECUTION_UID=$(shell id -u) \
DOCKER_GID=$(DOCKER_GID) DOCKER_GID=$(DOCKER_GID) \
TEST_MODULE=$(INTEGRATION_MODULE)
.PHONY: up down minimal context run integration start stop restart build build-nocache status clean pull help .PHONY: up down minimal context run integration start stop restart build build-nocache status clean pull help
...@@ -171,10 +172,10 @@ up: minimal ## start the base TANGO system and prepare requested services ...@@ -171,10 +172,10 @@ up: minimal ## start the base TANGO system and prepare requested services
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up --no-start --no-recreate $(SERVICE) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up --no-start --no-recreate $(SERVICE)
run: minimal ## run a service using arguments and delete it afterwards run: minimal ## run a service using arguments and delete it afterwards
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm $(SERVICE) $(SERVICE_ARGS) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run -T --no-deps --rm $(SERVICE) $(SERVICE_ARGS)
integration: minimal ## run a service using arguments and delete it afterwards integration: minimal ## run a service using arguments and delete it afterwards
TEST_MODULE=$(INTEGRATION_MODULE) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm integration-test $(INTEGRATION_ARGS) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run -T --no-deps --rm integration-test $(INTEGRATION_ARGS)
down: ## stop all services and tear down the system down: ## stop all services and tear down the system
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) down $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) down
......
#
# Docker compose file that launches an APSCT simulator
#
# Defines:
# - apsct-sim
#
version: '2.1'
services:
ccd-sim:
build:
context: pypcc-sim-base
args:
- LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
- LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
container_name: ${CONTAINER_NAME_PREFIX}ccd-sim
logging:
driver: "json-file"
options:
max-size: "100m"
max-file: "10"
networks:
- control
entrypoint: hwtr --simulator --port 4843 --config CCDTR
restart: on-failure
...@@ -33,12 +33,16 @@ services: ...@@ -33,12 +33,16 @@ services:
- control - control
ports: ports:
- "5715:5715" # unique port for this DS - "5715:5715" # unique port for this DS
- "5815:5815" # ZeroMQ event port
- "5915:5915" # ZeroMQ heartbeat port
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
volumes: volumes:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5815
- TANGO_ZMQ_HEARTBEAT_PORT=5915
working_dir: /opt/lofar/tango working_dir: /opt/lofar/tango
entrypoint: entrypoint:
- bin/start-ds.sh - bin/start-ds.sh
......
...@@ -32,12 +32,16 @@ services: ...@@ -32,12 +32,16 @@ services:
- control - control
ports: ports:
- "5709:5709" # unique port for this DS - "5709:5709" # unique port for this DS
- "5809:5809" # ZeroMQ event port
- "5909:5909" # ZeroMQ heartbeat port
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
volumes: volumes:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5809
- TANGO_ZMQ_HEARTBEAT_PORT=5909
working_dir: /opt/lofar/tango working_dir: /opt/lofar/tango
entrypoint: entrypoint:
- bin/start-ds.sh - bin/start-ds.sh
......
...@@ -32,12 +32,16 @@ services: ...@@ -32,12 +32,16 @@ services:
- control - control
ports: ports:
- "5710:5710" # unique port for this DS - "5710:5710" # unique port for this DS
- "5810:5810" # ZeroMQ event port
- "5910:5910" # ZeroMQ heartbeat port
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
volumes: volumes:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5810
- TANGO_ZMQ_HEARTBEAT_PORT=5910
working_dir: /opt/lofar/tango working_dir: /opt/lofar/tango
entrypoint: entrypoint:
- bin/start-ds.sh - bin/start-ds.sh
......
...@@ -32,12 +32,16 @@ services: ...@@ -32,12 +32,16 @@ services:
- control - control
ports: ports:
- "5712:5712" # unique port for this DS - "5712:5712" # unique port for this DS
- "5812:5812" # ZeroMQ event port
- "5912:5912" # ZeroMQ heartbeat port
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
volumes: volumes:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5812
- TANGO_ZMQ_HEARTBEAT_PORT=5912
working_dir: /opt/lofar/tango working_dir: /opt/lofar/tango
entrypoint: entrypoint:
- bin/start-ds.sh - bin/start-ds.sh
......
...@@ -31,12 +31,16 @@ services: ...@@ -31,12 +31,16 @@ services:
- control - control
ports: ports:
- "5708:5708" # unique port for this DS - "5708:5708" # unique port for this DS
- "5808:5808" # ZeroMQ event port
- "5908:5908" # ZeroMQ heartbeat port
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
volumes: volumes:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5808
- TANGO_ZMQ_HEARTBEAT_PORT=5908
working_dir: /opt/lofar/tango working_dir: /opt/lofar/tango
entrypoint: entrypoint:
- bin/start-ds.sh - bin/start-ds.sh
......
...@@ -35,12 +35,16 @@ services: ...@@ -35,12 +35,16 @@ services:
- "5003:5003/udp" # port to receive SST UDP packets on - "5003:5003/udp" # port to receive SST UDP packets on
- "5103:5103/tcp" # port to emit SST TCP packets on - "5103:5103/tcp" # port to emit SST TCP packets on
- "5717:5717" # unique port for this DS - "5717:5717" # unique port for this DS
- "5817:5817" # ZeroMQ event port
- "5917:5917" # ZeroMQ heartbeat port
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
volumes: volumes:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5817
- TANGO_ZMQ_HEARTBEAT_PORT=5917
working_dir: /opt/lofar/tango working_dir: /opt/lofar/tango
entrypoint: entrypoint:
- bin/start-ds.sh - bin/start-ds.sh
......
#
# Docker compose file that launches an interactive iTango session.
#
# Connect to the interactive session with 'docker attach itango'.
# Disconnect with the Docker deattach sequence: <CTRL>+<P> <CTRL>+<Q>
#
# Defines:
# - itango: iTango interactive session
#
# Requires:
# - lofar-device-base.yml
#
version: '2.1'
services:
device-ccd:
image: device-ccd
# build explicitly, as docker-compose does not understand a local image
# being shared among services.
build:
context: .
dockerfile: lofar-device-base/Dockerfile
args:
SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-itango:${TANGO_ITANGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}device-ccd
logging:
driver: "json-file"
options:
max-size: "100m"
max-file: "10"
networks:
- 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
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# 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
...@@ -32,12 +32,16 @@ services: ...@@ -32,12 +32,16 @@ services:
- control - control
ports: ports:
- "5713:5713" # unique port for this DS - "5713:5713" # unique port for this DS
- "5813:5813" # ZeroMQ event port
- "5913:5913" # ZeroMQ heartbeat port
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
volumes: volumes:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5813
- TANGO_ZMQ_HEARTBEAT_PORT=5913
working_dir: /opt/lofar/tango working_dir: /opt/lofar/tango
entrypoint: entrypoint:
- bin/start-ds.sh - bin/start-ds.sh
......
...@@ -32,6 +32,8 @@ services: ...@@ -32,6 +32,8 @@ services:
- control - control
ports: ports:
- "5705:5705" # unique port for this DS - "5705:5705" # unique port for this DS
- "5805:5805" # ZeroMQ event port
- "5905:5905" # ZeroMQ heartbeat port
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
volumes: volumes:
...@@ -40,6 +42,8 @@ services: ...@@ -40,6 +42,8 @@ services:
user: 1000:${DOCKER_GID} # uid 1000 is the default "tango" user user: 1000:${DOCKER_GID} # uid 1000 is the default "tango" user
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- TANGO_ZMQ_EVENT_PORT=5805
- TANGO_ZMQ_HEARTBEAT_PORT=5905
working_dir: /opt/lofar/tango working_dir: /opt/lofar/tango
entrypoint: entrypoint:
- bin/start-ds.sh - bin/start-ds.sh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment