From ceccfc98ef73825152095431bfa85c796f174c7a Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Sun, 4 Aug 2024 18:10:17 +0000 Subject: [PATCH 1/4] fix issue with custom repo files --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 25ee23a..20bc28d 100644 --- a/Makefile +++ b/Makefile @@ -106,14 +106,14 @@ sb_pubkey.der: curl --fail -L -o sb_pubkey.der $(SECURE_BOOT_KEY_URL) # Build boot.iso using Lorax -results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES) $(if $(SECURE_BOOT_KEY_URL),sb_pubkey.der) +results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(filter repos/%,$(_REPO_FILES)) $(if $(SECURE_BOOT_KEY_URL),sb_pubkey.der) $(if $(wildcard results), rm -Rf results) $(if $(wildcard /etc/rpm/macros.image-language-conf),mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf) lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \ --isfinal --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(PWD)/external/lorax/share/templates.d/99-generic \ $(_LORAX_ARGS) \ - $(foreach file,$(_REPO_FILES),--repo $(PWD)/$(file)) \ + $(foreach file,$(_REPO_FILES),--repo $(patsubst repos/%,$(PWD)/repos/%,$(file))) \ $(foreach file,$(_LORAX_TEMPLATES),--add-template $(PWD)/$(file)) \ $(foreach file,$(ADDITIONAL_TEMPLATES),--add-template $(file)) \ $(foreach file,$(_FLATPAK_TEMPLATES),--add-template $(file)) \ From 776a9a7e988b760789dfe55795a04a8621ff539d Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:38:47 -0400 Subject: [PATCH 2/4] Tag image with long sha (#136) --- .github/workflows/build_container.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index 54b9360..ca65ed7 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -72,6 +72,7 @@ jobs: tags: | type=ref,event=branch type=ref,event=pr + type=raw,value=${{ github.sha }} type=semver,pattern=v{{version}} type=semver,pattern=v{{major}}.{{minor}} type=semver,pattern=v{{major}}.{{minor}}.{{patch}} @@ -85,6 +86,7 @@ jobs: ghcr.io/${{ github.repository }} tags: | pr-${{ inputs.pr }} + ${{ github.sha }} - name: Buildah Build id: build-image From f98ebd14208b9aab7abf360b035db51ffe4acff9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:40:00 -0400 Subject: [PATCH 3/4] Bump sigstore/cosign-installer from 3.5.0 to 3.6.0 (#131) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jason Nagin <33561705+JasonN3@users.noreply.github.com> --- .github/workflows/build_container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index ca65ed7..32df1e1 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -123,7 +123,7 @@ jobs: - name: Install Cosign if: startsWith(github.ref, 'refs/tags/v') - uses: sigstore/cosign-installer@v3.5.0 + uses: sigstore/cosign-installer@v3.6.0 - name: Sign the images if: startsWith(github.ref, 'refs/tags/v') From aa74d32215ba7bd6682211bfc3c07ede6e182614 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:40:47 -0400 Subject: [PATCH 4/4] Bump docker/login-action from 3.2.0 to 3.3.0 (#129) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jason Nagin <33561705+JasonN3@users.noreply.github.com> --- .github/workflows/build_container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index 32df1e1..60ff1ea 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -97,7 +97,7 @@ jobs: labels: ${{ steps.meta.outputs.labels || steps.meta_pr.outputs.labels }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.actor }}