From f21953b69cd38787a9b49d718ca43ebd20fbeafb Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Mon, 9 Dec 2024 07:50:30 -0700 Subject: [PATCH] make makefile more consistent --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index efd6f2e..312f1ef 100644 --- a/Makefile +++ b/Makefile @@ -65,11 +65,11 @@ build_base: cp -pR image base_image ifeq ($(_build_amd64),1) docker rmi $(NAME)-base:current-amd64 || true - docker buildx build --progress=plain --platform linux/amd64 $(EXTRA_BUILD_FLAGS) --build-arg ARCH=amd64 -t $(REGISTRY)/phusion/passenger-base:current-amd64 -f image/Dockerfile.base base_image --no-cache + docker buildx build --progress=plain --platform linux/amd64 $(EXTRA_BUILD_FLAGS) --build-arg ARCH=amd64 -t $(NAME)-base:current-amd64 -f image/Dockerfile.base base_image --no-cache endif ifeq ($(_build_arm64),1) docker rmi $(NAME)-base:current-arm64 || true - docker buildx build --progress=plain --platform linux/arm64 $(EXTRA_BUILD_FLAGS) --build-arg ARCH=arm64 -t $(REGISTRY)/phusion/passenger-base:current-arm64 -f image/Dockerfile.base base_image --no-cache + docker buildx build --progress=plain --platform linux/arm64 $(EXTRA_BUILD_FLAGS) --build-arg ARCH=arm64 -t $(NAME)-base:current-arm64 -f image/Dockerfile.base base_image --no-cache endif rm -rf base_image @@ -162,8 +162,8 @@ clean: rm -rf *_image clean_images: $(foreach image, $(ALL_IMAGES), clean_image_${image}) FORCE - docker rmi $(REGISTRY)/phusion/passenger-base:current-amd64 phusion/passenger-base:current-amd64 || true - docker rmi $(REGISTRY)/phusion/passenger-base:current-arm64 phusion/passenger-base:current-arm64 || true + docker rmi $(NAME)-base:current-amd64 phusion/passenger-base:current-amd64 || true + docker rmi $(NAME)-base:current-arm64 phusion/passenger-base:current-arm64 || true clean_image_%: FORCE docker rmi $(NAME)-$*:latest-amd64 $(NAME)-$*:$(VERSION)-amd64 || true