From 66c8d1d1c9863d383eb3d0781c7f2a13e99a79d6 Mon Sep 17 00:00:00 2001 From: Camden Narzt Date: Tue, 31 Dec 2024 15:06:31 -0700 Subject: [PATCH] try aliasing to file --- .github/workflows/main.yml | 2 -- Makefile | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b92f46..49d840e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -91,8 +91,6 @@ jobs: with: name: base_${{ matrix.arch.name }} path: /tmp - - name: Load image - run: docker load --input /tmp/passenger-base-${{ matrix.arch.name }}.tar.gz - name: "Run make build_${{ matrix.img }}" run: "make build_${{ matrix.img }}" env: diff --git a/Makefile b/Makefile index 1ee4763..a45742e 100644 --- a/Makefile +++ b/Makefile @@ -98,10 +98,10 @@ build_%: echo final=1 >> ${*}_image/buildconfig; \ fi ifeq ($(_build_amd64),1) - docker buildx build --progress=plain --platform linux/amd64 $(EXTRA_BUILD_FLAGS) --build-arg NAME=$(NAME) --build-arg ARCH=amd64 -t $(NAME)-$*:$(VERSION)-amd64 --rm $*_image + docker buildx build --progress=plain --platform linux/amd64 $(EXTRA_BUILD_FLAGS) --build-arg NAME=$(NAME) --build-arg ARCH=amd64 -t $(NAME)-$*:$(VERSION)-amd64 --rm --build-context $(NAME)-base:current-amd64=/tmp/passenger-base-amd64.tar.gz $*_image endif ifeq ($(_build_arm64),1) - docker buildx build --progress=plain --platform linux/arm64 $(EXTRA_BUILD_FLAGS) --build-arg NAME=$(NAME) --build-arg ARCH=arm64 -t $(NAME)-$*:$(VERSION)-arm64 --rm $*_image + docker buildx build --progress=plain --platform linux/arm64 $(EXTRA_BUILD_FLAGS) --build-arg NAME=$(NAME) --build-arg ARCH=arm64 -t $(NAME)-$*:$(VERSION)-arm64 --rm --build-context $(NAME)-base:current-arm64=/tmp/passenger-base-arm64.tar.gz $*_image endif labels: $(foreach image, $(ALL_IMAGES), label_${image})