diff --git a/docker-compose/device-ccd.yml b/docker-compose/device-ccd.yml index 2c8e30a1474299e80edf10f5e9ef766eb1c5f16c..2f58a15d5679cb37f9f3305042f363ab8e7cb6cb 100644 --- a/docker-compose/device-ccd.yml +++ b/docker-compose/device-ccd.yml @@ -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 diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh index f1ee76c7606c485f5cf68ecb92bf9965390bd192..3047557a3678940748746acc6f7e7e3a59ea6090 100755 --- a/sbin/run_integration_test.sh +++ b/sbin/run_integration_test.sh @@ -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.