From 4a1f54dc0cbb84dbaba31eda72839c4d66b1bd5b Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Thu, 17 Oct 2024 16:30:54 +0300 Subject: [PATCH] Use env var EXP_ETCDRESTORE_DIR in etcdrestore docker image building Makefiles Signed-off-by: Furkat Gofurov --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 18236564..d1cd4065 100644 --- a/Makefile +++ b/Makefile @@ -349,7 +349,7 @@ docker-pull-prerequisites: docker-build-etcdrestore: buildx-machine docker-pull-prerequisites ## Build docker image for a specific architecture ## reads Dockerfile from stdin to avoid an incorrectly cached Dockerfile (https://github.com/moby/buildkit/issues/1368) # buildx does not support using local registry for multi-architecture images - cat ./exp/etcdrestore/Dockerfile | DOCKER_BUILDKIT=1 BUILDX_BUILDER=$(MACHINE) docker buildx build \ + cat $(EXP_ETCDRESTORE_DIR)/Dockerfile | DOCKER_BUILDKIT=1 BUILDX_BUILDER=$(MACHINE) docker buildx build \ --platform $(ARCH) \ --load \ --build-arg builder_image=$(GO_CONTAINER_IMAGE) \ @@ -359,7 +359,7 @@ docker-build-etcdrestore: buildx-machine docker-pull-prerequisites ## Build dock .PHONY: docker-build-and-push-etcdrestore docker-build-and-push-etcdrestore: buildx-machine docker-pull-prerequisites ## Run docker-build-and-push-etcdrestore targets for all architectures - cat ./exp/etcdrestore/Dockerfile | DOCKER_BUILDKIT=1 BUILDX_BUILDER=$(MACHINE) docker buildx build \ + cat $(EXP_ETCDRESTORE_DIR)/Dockerfile | DOCKER_BUILDKIT=1 BUILDX_BUILDER=$(MACHINE) docker buildx build \ --platform $(TARGET_PLATFORMS) \ --push \ --sbom=true \