Use toolkit image to build isos

Signed-off-by: Fredrik Lönnegren <fredrik.lonnegren@suse.com>
rancher · Nov 21, 2023 · b779089 · b779089
1 parent f80a6fc
commit b779089
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -44,6 +44,7 @@ jobs:
           username: ${{ secrets.ELEMENTAL_BOT_GITHUB_USERNAME }}
           password: ${{ secrets.ELEMENTAL_BOT_GITHUB_TOKEN }}
       - name: Build toolkit image
+        run: |
           make TOOLKIT_REPO=ghcr.io/${{ github.workspace }}/${{ github.repository }}/elemental-cli VERSION=$(git describe --abbrev=0 --tags) build push-toolkit
           make PLATFORM=linux/arm64,linux/amd64 TOOLKIT_REPO=ghcr.io/${{ github.workspace }}/${{ github.repository }}/elemental-cli VERSION=latest build push-toolkit
       - name: Build green example

diff --git a/Makefile b/Makefile
@@ -58,7 +58,7 @@ build-iso: build-os
 	@echo Building ${ARCH} ISO
 	mkdir -p $(ROOT_DIR)/build
 	$(DOCKER) run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(ROOT_DIR)/build:/build \
-		--entrypoint /usr/bin/elemental $(REPO):$(VERSION) --debug build-iso --bootloader-in-rootfs -n elemental-$(FLAVOR).$(ARCH) \
+		--entrypoint /usr/bin/elemental ${TOOLKIT_REPO}:${VERSION} --debug build-iso --bootloader-in-rootfs -n elemental-$(FLAVOR).$(ARCH) \
 		--local --platform $(PLATFORM) --squash-no-compression -o /build $(REPO):$(VERSION)
 
 .PHONY: clean-iso