From c6b34c7cf0ed21c04369e598c364128705f98c52 Mon Sep 17 00:00:00 2001 From: Kimonas Sotirchos Date: Wed, 15 Feb 2023 20:55:36 +0200 Subject: [PATCH] centraldashboard(make): Use correct dir (#6960) (#6972) Previously the app would not use the correct directory when running the docker buildx command, which resulted in the image to fail to get built. Signed-off-by: Kimonas Sotirchos --- components/centraldashboard/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/centraldashboard/Makefile b/components/centraldashboard/Makefile index 7ce194c37a8..1e3e33bcc1e 100644 --- a/components/centraldashboard/Makefile +++ b/components/centraldashboard/Makefile @@ -1,7 +1,7 @@ IMG ?= centraldashboard TAG ?= $(shell git describe --tags --always --dirty) COMMIT = $(shell git rev-parse HEAD) -DOCKERFILE ?= centraldashboard/Dockerfile +DOCKERFILE ?= Dockerfile ARCH ?= linux/amd64 @@ -32,12 +32,12 @@ docker-push: .PHONY: docker-build-multi-arch docker-build-multi-arch: ## Build multi-arch docker images with docker buildx - cd ../ && docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} -f ${DOCKERFILE} . + docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} -f ${DOCKERFILE} . .PHONY: docker-build-push-multi-arch -docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry - cd ../ && docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} --push -f ${DOCKERFILE} . +docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry + docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} --push -f ${DOCKERFILE} . # Build but don't attach the latest tag. This allows manual testing/inspection of the image # first.