From 6e0d47fd0d94e058f0158ff89b5a8b120f64c857 Mon Sep 17 00:00:00 2001 From: Matej Gera Date: Mon, 3 Jan 2022 17:06:23 +0100 Subject: [PATCH 1/2] Fix docker-build target Signed-off-by: Matej Gera --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7f37b967c3..055ada8283 100644 --- a/Makefile +++ b/Makefile @@ -182,13 +182,12 @@ docker-multi-stage: @echo ">> building docker image 'thanos' with Dockerfile.multi-stage" @docker build -f Dockerfile.multi-stage -t "thanos" --build-arg BASE_DOCKER_SHA=$(BASE_DOCKER_SHA) . -GET_SHA = $(shell echo '$1'_SHA | tr '[:lower:]' '[:upper:]') # docker-build builds docker images with multiple architectures. .PHONY: docker-build $(BUILD_DOCKER_ARCHS) docker-build: $(BUILD_DOCKER_ARCHS) $(BUILD_DOCKER_ARCHS): docker-build-%: @docker build -t "thanos-linux-$*" \ - --build-arg BASE_DOCKER_SHA=$($(call GET_SHA,$*)) \ + --build-arg BASE_DOCKER_SHA=$($(shell echo '$*')) \ --build-arg ARCH="$*" \ -f Dockerfile.multi-arch . From a14aa7c5067dd159cc2ea44d1fad4ead15bd9331 Mon Sep 17 00:00:00 2001 From: Matej Gera Date: Tue, 4 Jan 2022 09:10:15 +0100 Subject: [PATCH 2/2] Simplify Signed-off-by: Matej Gera --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 055ada8283..fa1c60e930 100644 --- a/Makefile +++ b/Makefile @@ -187,7 +187,7 @@ docker-multi-stage: docker-build: $(BUILD_DOCKER_ARCHS) $(BUILD_DOCKER_ARCHS): docker-build-%: @docker build -t "thanos-linux-$*" \ - --build-arg BASE_DOCKER_SHA=$($(shell echo '$*')) \ + --build-arg BASE_DOCKER_SHA="$($*)" \ --build-arg ARCH="$*" \ -f Dockerfile.multi-arch .