diff options
| author | tranch <tranch.xiao@gmail.com> | 2026-07-25 22:49:06 +0800 |
|---|---|---|
| committer | tranch <tranch.xiao@gmail.com> | 2026-07-25 22:49:06 +0800 |
| commit | 0ebf76e160c1e45d537e24d145fed47a38d8d99d (patch) | |
| tree | 113b033260936c8762a934af57ebc8fc00773c26 /.github/workflows | |
| parent | 63e9dd98331d0ef7c9c9984cbcf6a7aaba9572dc (diff) | |
| download | AeroCore-OS-0ebf76e160c1e45d537e24d145fed47a38d8d99d.tar.gz AeroCore-OS-0ebf76e160c1e45d537e24d145fed47a38d8d99d.zip | |
Route installer updates through OSTREE_IMAGE_REF
Use the configured ref for ISO boot origins and derive GHCR fallbacks
from the current repository instead of hardcoding the image path.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build-installer-iso.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.github/workflows/build-installer-iso.yml b/.github/workflows/build-installer-iso.yml index f7897b9..a6348aa 100644 --- a/.github/workflows/build-installer-iso.yml +++ b/.github/workflows/build-installer-iso.yml @@ -31,6 +31,7 @@ jobs: # Keep these aligned with the Fedora major used by the target bazzite-deck base image. LIVE_BASE_IMAGE: quay.io/fedora/fedora-kinoite:43 FEDORA_VERSION: "43" + OSTREE_IMAGE_REF: ${{ vars.OSTREE_IMAGE_REF }} steps: - name: Maximize build space @@ -72,19 +73,23 @@ jobs: - name: Build installer ISO payload run: | mkdir -p output + ostree_image_ref="${OSTREE_IMAGE_REF:-ostree-image-signed:docker://${IMAGE_REGISTRY}/${IMAGE_NAME}}" + install_image_ref="${ostree_image_ref#ostree-image-signed:docker://}" + install_image_ref="${install_image_ref#ostree-unverified-registry:docker://}" + install_image_ref="${install_image_ref#docker://}" sudo podman tag \ "${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}" \ - localhost/aerocore-os-installer:latest + "${install_image_ref}:${IMAGE_TAG}" sudo podman save \ --format oci-archive \ --output output/install-payload.oci \ - localhost/aerocore-os-installer:latest + "${install_image_ref}:${IMAGE_TAG}" sudo podman build \ --cap-add sys_admin \ --security-opt label=disable \ --build-arg "BASE_IMAGE=${LIVE_BASE_IMAGE}" \ - --build-arg "INSTALL_IMAGE_PAYLOAD=localhost/aerocore-os-installer:latest" \ + --build-arg "INSTALL_IMAGE_PAYLOAD=${install_image_ref}:${IMAGE_TAG}" \ --build-arg "INSTALL_IMAGE_PAYLOAD_ARCHIVE=/install-payload.oci" \ --tag localhost/aerocore-os-installer:latest \ --file installer/Containerfile \ |