Merge branch 'master' into L2SS-287-python-packaging

docker-compose/Makefile

@@ -13,7 +13,8 @@ ATTACH_COMPOSE_FILE_ARGS := $(foreach yml,$(filter-out tango.yml,$(COMPOSE_FILES
 # But we allow to overwrite it.
 NETWORK_MODE ?= tangonet
 
-# Host name through which others can reach our control interfaces
+# Host name through which others can reach our control interfaces.
+# Needs to be resolvable from the containers and clients.
 ifneq (,$(wildcard /run/WSL))
     # Microsoft Windows Subsystem for Linux
     HOSTNAME ?= host.docker.internal
@@ -21,6 +22,10 @@ else
     HOSTNAME ?= $(shell hostname -f)
 endif
 
+# Host name to which to send our container logs. Needs to be resolvable from
+# the host.
+LOG_HOSTNAME ?= localhost
+
 # If the first make argument is "start" or "stop"...
 ifeq (start,$(firstword $(MAKECMDGOALS)))
     SERVICE_TARGET = true
@@ -113,6 +118,7 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
     TANGO_HOST=$(TANGO_HOST) \
     MYSQL_HOST=$(MYSQL_HOST) \
     HOSTNAME=$(HOSTNAME) \
+    LOG_HOSTNAME=$(LOG_HOSTNAME) \
     NETWORK_MODE=$(NETWORK_MODE) \
     XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) \
     CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) \
@@ -130,7 +136,7 @@ pull: ## pull the images from the Docker hub
 build: ## rebuild images
 	# docker-compose does not support build dependencies, so manage those here
 	$(DOCKER_COMPOSE_ARGS) docker-compose -f lofar-device-base.yml -f networks.yml build --progress=plain
-	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build --progress=plain $(SERVICE)
+	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build --parallel --progress=plain $(SERVICE)
 
 build-nocache: ## rebuild images from scratch
 	# docker-compose does not support build dependencies, so manage those here

docker-compose/archiver.yml

@@ -20,7 +20,7 @@ services:
     logging:
       driver: syslog
       options:
-        syslog-address: udp://${HOSTNAME}:1514
+        syslog-address: udp://${LOG_HOSTNAME}:1514
         syslog-format: rfc3164
         tag: "{{.Name}}"
     restart: unless-stopped
@@ -45,7 +45,7 @@ services:
       logging:
         driver: syslog
         options:
-          syslog-address: udp://${HOSTNAME}:1514
+          syslog-address: udp://${LOG_HOSTNAME}:1514
           syslog-format: rfc3164
           tag: "{{.Name}}"
       restart: unless-stopped
@@ -70,7 +70,7 @@ services:
       logging:
         driver: syslog
         options:
-          syslog-address: udp://${HOSTNAME}:1514
+          syslog-address: udp://${LOG_HOSTNAME}:1514
           syslog-format: rfc3164
           tag: "{{.Name}}"
 
@@ -94,7 +94,7 @@ services:
     logging:
       driver: syslog
       options:
-        syslog-address: udp://${HOSTNAME}:1514
+        syslog-address: udp://${LOG_HOSTNAME}:1514
         syslog-format: rfc3164
         tag: "{{.Name}}"
     restart: unless-stopped

docker-compose/grafana.yml

@@ -26,7 +26,7 @@ services:
     logging:
       driver: syslog
       options:
-        syslog-address: udp://${HOSTNAME}:1514
+        syslog-address: udp://${LOG_HOSTNAME}:1514
         syslog-format: rfc3164
         tag: "{{.Name}}"
     restart: unless-stopped

docker-compose/prometheus.yml

@@ -19,7 +19,7 @@ services:
     logging:
       driver: syslog
       options:
-        syslog-address: udp://${HOSTNAME}:1514
+        syslog-address: udp://${LOG_HOSTNAME}:1514
         syslog-format: rfc3164
         tag: "{{.Name}}"
     restart: unless-stopped

docker-compose/rest.yml

@@ -36,7 +36,7 @@ services:
     logging:
       driver: syslog
       options:
-        syslog-address: udp://${HOSTNAME}:1514
+        syslog-address: udp://${LOG_HOSTNAME}:1514
         syslog-format: rfc3164
         tag: "{{.Name}}"
     restart: unless-stopped

docker-compose/tango.yml

@@ -31,7 +31,7 @@ services:
     logging:
       driver: syslog
       options:
-        syslog-address: udp://${HOSTNAME}:1514
+        syslog-address: udp://${LOG_HOSTNAME}:1514
         syslog-format: rfc3164
         tag: "{{.Name}}"
     restart: unless-stopped
@@ -64,7 +64,7 @@ services:
     logging:
       driver: syslog
       options:
-        syslog-address: udp://${HOSTNAME}:1514
+        syslog-address: udp://${LOG_HOSTNAME}:1514
         syslog-format: rfc3164
         tag: "{{.Name}}"
     restart: unless-stopped

sbin/run_integration_test.sh

@@ -9,8 +9,12 @@ if [ -z "$LOFAR20_DIR" ]; then
     LOFAR20_DIR=$(readlink -f "${LOFAR20_DIR_RELATIVE}")
 fi
 
-# Start and stop sequence
 cd "$LOFAR20_DIR/docker-compose" || exit 1
+
+# Make sure builds are recent, and use our building parameters.
+make build
+
+# Start and stop sequence
 make stop device-sdp device-recv device-sst device-unb2 device-xst sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim
 make start databaseds dsconfig elk