try extracting tarball

phusion · Jan 2, 2025 · 7bad24b · 7bad24b
1 parent 51693e5
commit 7bad24b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -91,8 +91,8 @@ jobs:
         with:
           name: base_${{ matrix.arch.name }}
           path: /tmp
-      - run: gunzip /tmp/passenger-base-${{ matrix.arch.name }}.tar.gz
-      - run: ls /tmp/
+      - name: Extract base image
+        run: tar -xvf /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
@@ -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 --build-context $(NAME)-base:current-amd64=file:///tmp/passenger-base-amd64.tar $*_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 $*_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 --build-context $(NAME)-base:current-arm64=file:///tmp/passenger-base-arm64.tar $*_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 $*_image
 endif
 
 labels: $(foreach image, $(ALL_IMAGES), label_${image})