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

Merge branch 'L2SS-912_add_CCD_device' of https://git.astron.nl/lofar2.0/tango...

Merge branch 'L2SS-912_add_CCD_device' of https://git.astron.nl/lofar2.0/tango into L2SS-912_add_CCD_device
parents 5d6bfe13 c9204d92
No related branches found
No related tags found
2 merge requests!415Draft: Resolve L2SS-912 "Add ccd device testing",!406Resolve L2SS-912 "Add ccd device"
......@@ -18,8 +18,8 @@ services:
# build explicitly, as docker-compose does not understand a local image.
# being shared among services.
build:
context: ..
dockerfile: docker-compose/lofar-device-base/Dockerfile
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
......
......@@ -75,7 +75,7 @@ echo '/usr/local/bin/wait-for-it.sh ${TANGO_HOST} --strict --timeout=300 -- true
DEVICES="device-boot device-apsct device-ccd device-apspu device-sdp device-recv device-bst device-sst device-unb2 device-xst device-beamlet device-digitalbeam device-tilebeam device-psoc device-pcon device-antennafield device-temperature-manager device-observation device-observation-control"
SIMULATORS="sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim"
SIMULATORS="sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim ccd-sim"
# Build only the required images, please do not build everything that makes CI
# take really long to finish, especially grafana / jupyter / prometheus.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment