Extract NETWORK_MODE as a configurable parameter

Add prototype 'attach' make target

docker-compose/Makefile

@@ -5,11 +5,21 @@ BASEDIR := $(notdir $(patsubst %/,%,$(dir $(MAKEPATH))))
 COMPOSE_FILES := $(wildcard *.yml)
 COMPOSE_FILE_ARGS := $(foreach yml,$(COMPOSE_FILES),-f $(yml))
 
+ATTACH_COMPOSE_FILE_ARGS := $(foreach yml,$(filter-out tango.yml,$(COMPOSE_FILES)),-f $(yml))
+
 # If the first make argument is "start" or "stop"...
 ifeq (start,$(firstword $(MAKECMDGOALS)))
   SERVICE_TARGET = true
 else ifeq (stop,$(firstword $(MAKECMDGOALS)))
   SERVICE_TARGET = true
+else ifeq (attach,$(firstword $(MAKECMDGOALS)))
+  SERVICE_TARGET = true
+ifndef NETWORK_MODE
+$(error NETWORK_MODE must specify the network to attach to, e.g., make NETWORK_MODE=tangonet-powersupply ...)
+endif
+ifndef TANGO_HOST
+$(error TANGO_HOST must specify the Tango database device, e.g., make TANGO_HOST=powersupply-databaseds:100000 ...)
+endif
 endif
 ifdef SERVICE_TARGET
   # .. then use the rest as arguments for the make target
@@ -18,15 +28,26 @@ ifdef SERVICE_TARGET
   $(eval $(SERVICE):;@:)
 endif
 
+#
+# Never use the network=host mode when running CI jobs, and add extra
+# distinguishing identifiers to the network name and container names to
+# prevent collisions with jobs from the same project running at the same
+# time.
+#
+ifneq ($(CI_JOB_ID),)
+NETWORK_MODE := tangonet-$(CI_JOB_ID)
+CONTAINER_NAME_PREFIX := $(CI_JOB_ID)-
+else
+CONTAINER_NAME_PREFIX :=
+endif
 
 ifeq ($(OS),Windows_NT)
+    $(error Sorry, Windows is not supported yet)
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Linux)
 		DISPLAY ?= :0.0
-		TANGO_HOST ?= $(shell hostname):10000
-		MYSQL_HOST ?= $(shell hostname):3306
-		NETWORK_MODE := host
+		NETWORK_MODE ?= host
 		XAUTHORITY_MOUNT := /tmp/.X11-unix:/tmp/.X11-unix
 		XAUTHORITY ?= /hosthome/.Xauthority
 		# /bin/sh (=dash) does not evaluate 'docker network' conditionals correctly
@@ -36,17 +57,28 @@ else
 		IF_INTERFACE := $(shell netstat -nr | awk '{ if ($$1 ~/default/) { print $$6} }')
 		DISPLAY := $(shell ifconfig $(IF_INTERFACE) | awk '{ if ($$1 ~/inet/) { print $$2} }'):0
 		# network_mode = host doesn't work on MacOS, so fix to the internal network
-		NETWORK_MODE := tangonet
-		TANGO_HOST := databaseds:10000
-		MYSQL_HOST := tangodb:3306
-		XAUTHORITY_MOUNT := $(HOME):/hosthome:ro
+		NETWORK_MODE ?= tangonet
+		XAUTHORITY_MOUNT := $(HOME)/.Xauthority:/hosthome/.Xauthority:ro
 		XAUTHORITY := /hosthome/.Xauthority
 	endif
 endif
 
+#
+# When running in network=host mode, point devices at a port on the host
+# machine rather than at the container.
+#
+ifeq ($(NETWORK_MODE),host)
+	TANGO_HOST := $(shell hostname):10000
+	MYSQL_HOST := $(shell hostname):3306
+else
+	TANGO_HOST := $(CONTAINER_NAME_PREFIX)databaseds:10000
+	MYSQL_HOST := $(CONTAINER_NAME_PREFIX)tangodb:3306
+endif
+
 DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) XAUTHORITY=$(XAUTHORITY) TANGO_HOST=$(TANGO_HOST) \
 		NETWORK_MODE=$(NETWORK_MODE) XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) MYSQL_HOST=$(MYSQL_HOST) \
-		COMPOSE_IGNORE_ORPHANS=true
+		CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) COMPOSE_IGNORE_ORPHANS=true
+
 
 .PHONY: up down minimal start stop status clean pull help
 .DEFAULT_GOAL := help
@@ -59,10 +91,14 @@ up: minimal  ## start the base TANGO system and prepare all services
 
 down:  ## stop all services and tear down the system
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) down
-	docker network inspect tangonet &> /dev/null && ([ $$? -eq 0 ] && docker network rm tangonet) || true
+ifneq ($(NETWORK_MODE),host)
+	docker network inspect $(NETWORK_MODE) &> /dev/null && ([ $$? -eq 0 ] && docker network rm $(NETWORK_MODE)) || true
+endif
 
 minimal: ## start the base TANGO system
-	docker network inspect tangonet &> /dev/null || ([ $$? -ne 0 ] && docker network create tangonet)
+ifneq ($(NETWORK_MODE),host)
+	docker network inspect $(NETWORK_MODE) &> /dev/null || ([ $$? -ne 0 ] && docker network create $(NETWORK_MODE))
+endif
 	$(DOCKER_COMPOSE_ARGS) docker-compose -f tango.yml up -d
 
 start: up ## start a service (usage: make start <servicename>)
@@ -71,6 +107,9 @@ start: up ## start a service (usage: make start <servicename>)
 stop:  ## stop a service (usage: make stop <servicename>)
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) stop $(SERVICE)
 
+attach:  ## attach a service to an existing Tango network
+	$(DOCKER_COMPOSE_ARGS) docker-compose $(ATTACH_COMPOSE_FILE_ARGS) up -d $(SERVICE)
+
 status:  ## show the container status
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) ps
 

docker-compose/astor.yml

@@ -14,10 +14,8 @@ version: '2'
 services:
   astor:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
-    container_name: astor
+    container_name: ${CONTAINER_NAME_PREFIX}astor
     network_mode: ${NETWORK_MODE}
-    depends_on:
-      - databaseds
     volumes:
       - ${XAUTHORITY_MOUNT}
     environment:
@@ -34,15 +32,13 @@ services:
 
   starter-example:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-starter:latest
-    container_name: starter-example
+    container_name: ${CONTAINER_NAME_PREFIX}starter-example
     network_mode: ${NETWORK_MODE}
     # set the hostname, otherwise duplicate device registrations result every
     # time the hostname changes as the container is restarted.
     hostname: starter-example
-    depends_on:
-    - databaseds
     environment:
-    - TANGO_HOST=databaseds:10000
+    - TANGO_HOST=${TANGO_HOST}
     entrypoint:
     - /usr/local/bin/wait-for-it.sh
     - ${TANGO_HOST}

docker-compose/itango.yml

@@ -15,10 +15,8 @@ version: '2'
 services:
   itango:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:latest
-    container_name: itango
+    container_name: ${CONTAINER_NAME_PREFIX}itango
     network_mode: ${NETWORK_MODE}
-    depends_on:
-      - databaseds
     environment:
       - TANGO_HOST=${TANGO_HOST}
     stdin_open: true

docker-compose/jive.yml

@@ -13,10 +13,8 @@ version: '2'
 services:
   jive:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
-    container_name: jive
+    container_name: ${CONTAINER_NAME_PREFIX}jive
     network_mode: ${NETWORK_MODE}
-    depends_on:
-      - databaseds
     volumes:
       - ${XAUTHORITY_MOUNT}
     environment:

docker-compose/logviewer.yml

@@ -13,10 +13,8 @@ version: '2'
 services:
   logviewer:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
-    container_name: logviewer
+    container_name: ${CONTAINER_NAME_PREFIX}logviewer
     network_mode: ${NETWORK_MODE}
-    depends_on:
-      - databaseds
     volumes:
       - ${XAUTHORITY_MOUNT}
     environment:

docker-compose/pogo.yml

@@ -21,11 +21,11 @@ volumes:
 services:
   pogo:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-pogo:latest
-    container_name: pogo
+    container_name: ${CONTAINER_NAME_PREFIX}pogo
     network_mode: ${NETWORK_MODE}
     volumes:
       - pogo:/home/tango
-      - $HOME:/hosthome:rw
+      - ${HOME}:/hosthome:rw
       - ${XAUTHORITY_MOUNT}
     environment:
       - XAUTHORITY=${XAUTHORITY}

docker-compose/rest.yml

@@ -14,13 +14,11 @@ version: '2'
 services:
   rest:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-rest:latest
-    container_name: tango-rest
+    container_name: ${CONTAINER_NAME_PREFIX}tango-rest
     network_mode: ${NETWORK_MODE}
     # set the hostname, otherwise duplicate device registrations result every
     # time the hostname changes as the container is restarted.
     hostname: tango-rest
-    depends_on:
-    - databaseds
     environment:
     - TANGO_HOST=${TANGO_HOST}
     ports:

docker-compose/tango.yml

@@ -16,7 +16,7 @@ volumes:
 services:
   tangodb:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:latest
-    container_name: tangodb
+    container_name: ${CONTAINER_NAME_PREFIX}tangodb
     network_mode: ${NETWORK_MODE}
     environment:
       - MYSQL_ROOT_PASSWORD=secret
@@ -28,9 +28,8 @@ services:
 
   databaseds:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
-    container_name: databaseds
+    container_name: ${CONTAINER_NAME_PREFIX}databaseds
     network_mode: ${NETWORK_MODE}
-    hostname: databaseds
     depends_on:
       - tangodb
     environment:

docker-compose/tangotest.yml

@@ -12,10 +12,8 @@ version: '2'
 services:
   tangotest:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
-    container_name: tangotest
+    container_name: ${CONTAINER_NAME_PREFIX}tangotest
     network_mode: ${NETWORK_MODE}
-    depends_on:
-      - databaseds
     environment:
       - TANGO_HOST=${TANGO_HOST}
     entrypoint: