mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 02:47:56 +01:00
Merge branch 'main' into dependabot/github_actions/docker/login-action-3.3.0
This commit is contained in:
commit
f07935e00d
2 changed files with 5 additions and 3 deletions
4
.github/workflows/build_container.yml
vendored
4
.github/workflows/build_container.yml
vendored
|
|
@ -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
|
||||
|
|
@ -121,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')
|
||||
|
|
|
|||
4
Makefile
4
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)) \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue