From b44a45d3feddce6b5a23dd1f82bfd5856efda118 Mon Sep 17 00:00:00 2001 From: Felipe Cecagno <fcecagno@gmail.com> Date: Fri, 1 Feb 2019 17:29:10 -0300 Subject: [PATCH] update Makefile to build all images --- labs/docker/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/labs/docker/Makefile b/labs/docker/Makefile index 63d7fb33b4..8193e70121 100644 --- a/labs/docker/Makefile +++ b/labs/docker/Makefile @@ -10,7 +10,7 @@ BUILD_VERSION?= BUILD_IMAGE=0 IMAGE_ACCOUNT?= IMAGE_REPO?= -IMAGE_TAG=latest +IMAGE_TAG?=latest TAG_REVISION?=0 all: release @@ -21,6 +21,7 @@ image: if [ "$(IMAGE_ACCOUNT)" != "" ]; then \ if [ "$(IMAGE_REPO)" != "" ]; then \ docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_ACCOUNT)/$(IMAGE_REPO):$(IMAGE_NAME); \ + docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_ACCOUNT)/$(IMAGE_REPO):$(IMAGE_NAME)-$(IMAGE_TAG); \ if [ "$(TAG_REVISION)" == "1" ]; then \ docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_ACCOUNT)/$(IMAGE_REPO):$(IMAGE_NAME)-$(BUILD_REVISION); \ fi \ @@ -28,6 +29,7 @@ image: else \ if [ "$(IMAGE_REPO)" != "" ]; then \ docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_REPO):$(IMAGE_NAME); \ + docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_REPO):$(IMAGE_NAME)-$(IMAGE_TAG); \ if [ "$(TAG_REVISION)" == "1" ]; then \ docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_REPO):$(IMAGE_NAME)-$(BUILD_REVISION); \ fi \ -- GitLab