From 5cc2104e040593b20cf938f807d1f76d405fcb2b Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 1 Dec 2020 19:39:26 +0100
Subject: [PATCH] Properly propagate source image for our itango image.
---
docker-compose/Makefile | 3 +++
docker-compose/itango.yml | 5 ++++-
docker-compose/lofar-itango/Dockerfile | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index ef3d06024..0b2f8f7c2 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -91,6 +91,9 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) XAUTHORITY=$(XAUTHORITY) TANGO_HOST=$(
pull: ## pull the images from the Docker hub
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) pull
+build: ## rebuild images
+ $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build
+
up: minimal ## start the base TANGO system and prepare all services
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) up --no-start
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index c7006a60f..efc549504 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -14,7 +14,10 @@ version: '2'
services:
itango:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:latest
+ build:
+ context: lofar-itango
+ args:
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:latest
container_name: ${CONTAINER_NAME_PREFIX}itango
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/lofar-itango/Dockerfile b/docker-compose/lofar-itango/Dockerfile
index 4bef1ebc4..196b4f786 100644
--- a/docker-compose/lofar-itango/Dockerfile
+++ b/docker-compose/lofar-itango/Dockerfile
@@ -1,3 +1,4 @@
-FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:latest
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
RUN pip3 install "opcua >= 0.98.9" astropy
--
GitLab