Merge branch 'share-image-across-devices' into 'master'

Share same image and ensure built across all tango devices

See merge request !566

.gitlab-ci.yml

@@ -117,28 +117,6 @@ docker_build_image_all:
     - 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 unb2-sim latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-antennafield 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-apspu latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-boot latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-station-manager 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-ccd latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-configuration latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-digitalbeam latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-docker latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation-control latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-pcon latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-psoc latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-recv latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sdp latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-temperature-manager 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-unb2 latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-bst latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sst latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-xst latest
 
 # Build and push custom images on merge request if relevant files changed
 docker_build_image_lofar_device_base:
@@ -284,248 +262,6 @@ docker_build_image_unb2_sim:
   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 unb2-sim $tag
-docker_build_image_device_apsct:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-aspct.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-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_configuration:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-configuration.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-configuration $tag
-docker_build_image_device_apspu:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-apspu.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-apspu $tag
-docker_build_image_device_psoc:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-psoc.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-psoc $tag
-docker_build_image_device_pcon:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-pcon.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-pcon $tag
-docker_build_image_device_tilebeam:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-tilebeam.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-tilebeam $tag
-docker_build_image_device_beamlet:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-beamlet.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-beamlet $tag
-docker_build_image_device_digitalbeam:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-digitalbeam.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-digitalbeam $tag
-docker_build_image_device_station_manager :
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-station-manager.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-station-manager $tag
-docker_build_image_device_boot:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-boot.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-boot $tag
-docker_build_image_device_docker:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-docker.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-docker $tag
-docker_build_image_device_observation:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-observation.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-observation $tag
-docker_build_image_device_observation_control:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-observation-control.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-observation-control $tag
-docker_build_image_device_antennafield:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-antennafield.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-antennafield $tag
-docker_build_image_device_recv:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-recv.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-recv $tag
-docker_build_image_device_sdp:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-sdp.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-sdp $tag
-docker_build_image_device_bst:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-bst.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-bst $tag
-docker_build_image_device_sst:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-sst.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-sst $tag
-docker_build_image_device_unb2:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-unb2.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-unb2 $tag
-docker_build_image_device_xst:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-xst.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-xst $tag
-docker_build_image_device_temperature_manager:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/device-temperature-manager.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-temperature-manager $tag
 newline_at_eof:
   stage: linting
   before_script:

docker-compose/Makefile

@@ -160,24 +160,30 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
     TEST_MODULE=$(INTEGRATION_MODULE)
 
 
-.PHONY: up down minimal context run integration start stop restart build build-nocache status clean pull help await
+.PHONY: up base base-nocache down minimal context run integration start stop restart build build-nocache status clean pull help await
 .DEFAULT_GOAL := help
 
 pull: ## pull the images from the Docker hub
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) pull
 
-build: context ## rebuild images
+base: context ## Build base lofar device image
+	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build --progress=plain lofar-device-base
+
+base-nocache: context ## Rebuild base lofar device image
+	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build --no-cache --progress=plain lofar-device-base
+
+build: base ## build images
 	# docker-compose does not support build dependencies, so manage those here
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build --parallel --progress=plain $(SERVICE)
 
-build-nocache: context ## rebuild images from scratch
+build-nocache: base-nocache ## rebuild images from scratch
 	# docker-compose does not support build dependencies, so manage those here
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build --no-cache --progress=plain $(SERVICE)
 
-up: minimal  ## start the base TANGO system and prepare requested services
+up: base minimal  ## start the base TANGO system and prepare requested services
 	$(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: base minimal  ## run a service using arguments and delete it afterwards
 	$(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

docker-compose/device-antennafield.yml

@@ -17,14 +17,7 @@ version: '2.1'
 
 services:
   device-antennafield:
-    image: device-antennafield
-    # 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}
+    image: lofar-device-base
     container_name: device-antennafield
     logging:
       driver: "json-file"

docker-compose/device-apsct.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-apsct:
-    image: device-apsct
-    # 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}
+    image: lofar-device-base
     container_name: device-apsct
     logging:
       driver: "json-file"

docker-compose/device-apspu.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-apspu:
-    image: device-apspu
-    # 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}
+    image: lofar-device-base
     container_name: device-apspu
     logging:
       driver: "json-file"

docker-compose/device-beamlet.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-beamlet:
-    image: device-beamlet
-    # 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}
+    image: lofar-device-base
     container_name: device-beamlet
     logging:
       driver: "json-file"

docker-compose/device-boot.yml

@@ -15,14 +15,7 @@ version: '2.1'
 
 services:
   device-boot:
-    image: device-boot
-    # 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}
+    image: lofar-device-base
     container_name: device-boot
     logging:
       driver: "json-file"

docker-compose/device-bst.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-bst:
-    image: device-bst
-    # 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}
+    image: lofar-device-base
     container_name: device-bst
     logging:
       driver: "json-file"

docker-compose/device-ccd.yml

@@ -16,14 +16,7 @@ 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}
+    image: lofar-device-base
     container_name: device-ccd
     logging:
       driver: "json-file"

docker-compose/device-configuration.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-configuration:
-    image: device-configuration
-    # 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}
+    image: lofar-device-base
     container_name: device-configuration
     logging:
       driver: "json-file"

docker-compose/device-digitalbeam.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-digitalbeam:
-    image: device-digitalbeam
-    # 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}
+    image: lofar-device-base
     container_name: device-digitalbeam
     logging:
       driver: "json-file"

docker-compose/device-docker.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-docker:
-    image: device-docker
-    # 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}
+    image: lofar-device-base
     container_name: device-docker
     logging:
       driver: "json-file"

docker-compose/device-observation-control.yml

@@ -15,14 +15,7 @@ version: '2.1'
 
 services:
   device-observation-control:
-    image: device-observation-control
-    # 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}
+    image: lofar-device-base
     container_name: device-observation-control
     logging:
       driver: "json-file"

docker-compose/device-observation.yml

@@ -14,14 +14,7 @@ version: '2.1'
 
 services:
   device-observation:
-    image: device-observation
-    # 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}
+    image: lofar-device-base
     container_name: device-observation
     logging:
       driver: "json-file"

docker-compose/device-pcon.yml

@@ -11,14 +11,7 @@ volumes:
 
 services:
   device-pcon:
-    image: device-pcon
-    # 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}
+    image: lofar-device-base
     container_name: device-pcon
     logging:
       driver: "json-file"

docker-compose/device-psoc.yml

@@ -11,14 +11,7 @@ volumes:
 
 services:
   device-psoc:
-    image: device-psoc
-    # 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}
+    image: lofar-device-base
     container_name: device-psoc
     logging:
       driver: "json-file"

docker-compose/device-recv.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-recv:
-    image: device-recv
-    # 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}
+    image: lofar-device-base
     container_name: device-recv
     logging:
       driver: "json-file"

docker-compose/device-sdp.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-sdp:
-    image: device-sdp
-    # 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}
+    image: lofar-device-base
     container_name: device-sdp
     logging:
       driver: "json-file"

docker-compose/device-sst.yml

@@ -16,14 +16,7 @@ version: '2.1'
 
 services:
   device-sst:
-    image: device-sst
-    # 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}
+    image: lofar-device-base
     container_name: device-sst
     logging:
       driver: "json-file"

docker-compose/device-station-manager.yml

@@ -11,14 +11,7 @@ volumes:
 
 services:
   device-station-manager:
-    image: device-station-manager
-    # 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}
+    image: lofar-device-base
     container_name: device-station-manager
     logging:
       driver: "json-file"