Fix software locations in device container, make sure lofar-device-base is...

Fix software locations in device container, make sure lofar-device-base is built first, as docker-compose does not support build-time dependencies.

docker-compose/Makefile

@@ -92,6 +92,8 @@ pull: ## pull the images from the Docker hub
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) pull
 
 build: ## rebuild images
+	# docker-compose does not support build dependencies, so manage those here
+	$(DOCKER_COMPOSE_ARGS) docker-compose -f lofar-device-base.yml build
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build
 
 up: minimal  ## start the base TANGO system and prepare all services

docker-compose/device-pcc.yml

@@ -14,11 +14,11 @@ version: '2'
 
 services:
   device-pcc:
-    image: docker-compose_lofar-device-base:latest
+    image: lofar-device-base
     container_name: ${CONTAINER_NAME_PREFIX}device-pcc
     network_mode: ${NETWORK_MODE}
     volumes:
-        - ${TANGO_LOFAR_CONTAINER_DIR}:/opt/lofar
+        - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
     entrypoint:
@@ -27,4 +27,4 @@ services:
       - --timeout=30
       - --strict
       - --
-      - python3 -u /opt/lofar/PCC/PCC LTS -v
+      - python3 -u ${TANGO_LOFAR_CONTAINER_DIR}/PCC/PCC LTS -v

docker-compose/device-sdp.yml

@@ -14,11 +14,11 @@ version: '2'
 
 services:
   device-sdp:
-    image: docker-compose_lofar-device-base:latest
+    image: lofar-device-base
     container_name: ${CONTAINER_NAME_PREFIX}device-sdp
     network_mode: ${NETWORK_MODE}
     volumes:
-        - ${TANGO_LOFAR_CONTAINER_DIR}:/opt/lofar
+        - ${TANGO_LOFAR_CONTAINER_MOUNT}
     environment:
       - TANGO_HOST=${TANGO_HOST}
     entrypoint:
@@ -27,4 +27,4 @@ services:
       - --timeout=30
       - --strict
       - --
-      - python3 -u /opt/lofar/SDP/SDP LTS -v
+      - python3 -u ${TANGO_LOFAR_CONTAINER_DIR}/SDP/SDP LTS -v

docker-compose/lofar-device-base.yml

@@ -14,6 +14,7 @@ version: '2'
 
 services:
   lofar-device-base:
+    image: lofar-device-base
     build:
         context: lofar-device-base
     container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base