From a974abfb00a88768c095ad1477bf9f563e69d0d0 Mon Sep 17 00:00:00 2001 From: John Hogenmiller Date: Sat, 2 May 2020 11:06:28 -0400 Subject: [PATCH] improved use of docker_tag --- Makefile | 2 ++ st2actionrunner/Dockerfile | 3 ++- st2api/Dockerfile | 3 ++- st2auth/Dockerfile | 3 ++- st2garbagecollector/Dockerfile | 3 ++- st2notifier/Dockerfile | 3 ++- st2resultstracker/Dockerfile | 3 ++- st2rulesengine/Dockerfile | 3 ++- st2scheduler/Dockerfile | 3 ++- st2sensorcontainer/Dockerfile | 3 ++- st2stream/Dockerfile | 3 ++- st2timersengine/Dockerfile | 3 ++- st2workflowengine/Dockerfile | 3 ++- 13 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 540a2d8f..168ea53e 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,11 @@ build: @echo -e "\033[32mSuccessfully built \033[1mstackstorm/st2:${DOCKER_TAG}\033[0m\033[32m common Docker image with StackStorm version \033[1m${ST2_VERSION}\033[0m" @set -e; \ for component in st2*; do \ + echo -e "\033[32mStarting build of \033[1mstackstorm/$$component:${DOCKER_TAG}\033[0m\033[32m Docker image for StackStorm version \033[1m${ST2_VERSION}\033[0m"; \ docker build \ --no-cache \ --build-arg ST2_VERSION=${ST2_VERSION} \ + --build-arg DOCKER_TAG=${DOCKER_TAG} \ --tag stackstorm/$$component:${DOCKER_TAG} \ $$component/; \ echo -e "\033[32mSuccessfully built \033[1mstackstorm/$$component:${DOCKER_TAG}\033[0m\033[32m Docker image for StackStorm version \033[1m${ST2_VERSION}\033[0m"; \ diff --git a/st2actionrunner/Dockerfile b/st2actionrunner/Dockerfile index da64489b..f86ba243 100644 --- a/st2actionrunner/Dockerfile +++ b/st2actionrunner/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2actionrunner" # Install utils used by st2 'linux' pack, part of StackStorm core diff --git a/st2api/Dockerfile b/st2api/Dockerfile index 6cb618b1..70fc2504 100644 --- a/st2api/Dockerfile +++ b/st2api/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2api" USER st2 diff --git a/st2auth/Dockerfile b/st2auth/Dockerfile index 38112dd4..a0a58ed4 100644 --- a/st2auth/Dockerfile +++ b/st2auth/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2auth" USER st2 diff --git a/st2garbagecollector/Dockerfile b/st2garbagecollector/Dockerfile index 3c193666..ba7bd52f 100644 --- a/st2garbagecollector/Dockerfile +++ b/st2garbagecollector/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2garbagecollector" USER st2 diff --git a/st2notifier/Dockerfile b/st2notifier/Dockerfile index 5345ab6b..6dd1a0af 100644 --- a/st2notifier/Dockerfile +++ b/st2notifier/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2notifier" USER st2 diff --git a/st2resultstracker/Dockerfile b/st2resultstracker/Dockerfile index add1ca9e..53413f2d 100644 --- a/st2resultstracker/Dockerfile +++ b/st2resultstracker/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2resultstracker" USER st2 diff --git a/st2rulesengine/Dockerfile b/st2rulesengine/Dockerfile index 464e20e9..41071dde 100644 --- a/st2rulesengine/Dockerfile +++ b/st2rulesengine/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2rulesengine" USER st2 diff --git a/st2scheduler/Dockerfile b/st2scheduler/Dockerfile index 6b690f0e..44d14065 100644 --- a/st2scheduler/Dockerfile +++ b/st2scheduler/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2scheduler" USER st2 diff --git a/st2sensorcontainer/Dockerfile b/st2sensorcontainer/Dockerfile index 86d0a85c..453f8ece 100644 --- a/st2sensorcontainer/Dockerfile +++ b/st2sensorcontainer/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2sensorcontainer" USER st2 diff --git a/st2stream/Dockerfile b/st2stream/Dockerfile index 8b3192bc..5ed77c0a 100644 --- a/st2stream/Dockerfile +++ b/st2stream/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2stream" USER st2 diff --git a/st2timersengine/Dockerfile b/st2timersengine/Dockerfile index cb36ec07..69e8fcbf 100644 --- a/st2timersengine/Dockerfile +++ b/st2timersengine/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2timersengine" USER st2 diff --git a/st2workflowengine/Dockerfile b/st2workflowengine/Dockerfile index a56f0cf7..cc44b159 100644 --- a/st2workflowengine/Dockerfile +++ b/st2workflowengine/Dockerfile @@ -1,5 +1,6 @@ ARG ST2_VERSION -FROM stackstorm/st2:${ST2_VERSION} +ARG DOCKER_TAG +FROM stackstorm/st2:${DOCKER_TAG} LABEL com.stackstorm.component="st2workflowengine" USER st2