Merge branch 'master' of https://git.astron.nl/lofar2.0/tango into...

Merge branch 'master' of https://git.astron.nl/lofar2.0/tango into L2SS-216_2021-05-17-Branched_from_master-SDP_hotfix

docker-compose/device-pcc.yml

@@ -14,7 +14,11 @@ version: '2'
 
 services:
   device-pcc:
-    image: lofar-device-base
+    image: device-pcc
+    # build explicitly, as docker-compose does not understand a local image
+    # being shared among services.
+    build:
+        context: lofar-device-base
     container_name: ${CONTAINER_NAME_PREFIX}device-pcc
     network_mode: ${NETWORK_MODE}
     volumes:

docker-compose/device-sdp.yml

@@ -14,7 +14,11 @@ version: '2'
 
 services:
   device-sdp:
-    image: lofar-device-base
+    image: device-sdp
+    # build explicitly, as docker-compose does not understand a local image
+    # being shared among services.
+    build:
+        context: lofar-device-base
     container_name: ${CONTAINER_NAME_PREFIX}device-sdp
     network_mode: ${NETWORK_MODE}
     volumes: