From 5a96b03c6438acf057f527dabd2fe3b6e852b728 Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Tue, 31 Dec 2024 14:21:55 -0700 Subject: [PATCH] typo and image loading issues --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a15fac8..6432e69 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 $(NAME)-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 --load 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 $(NAME)-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 --load endif rm -rf base_image @@ -78,7 +78,7 @@ ifeq ($(_build_amd64),1) docker export $(NAME)-base:current-amd64 | gzip > passenger-base-amd64.tar.gz endif ifeq ($(_build_arm64),1) - docker export $(NAME)-base:current-amd64 | gzip > passenger-base-arm64.tar.gz + docker export $(NAME)-base:current-arm64 | gzip > passenger-base-arm64.tar.gz endif build_%: