diff options
| author | tranch <tranch.xiao@gmail.com> | 2026-07-22 08:40:43 +0800 |
|---|---|---|
| committer | tranch <tranch.xiao@gmail.com> | 2026-07-22 08:40:43 +0800 |
| commit | fc07365cdc27a2e78a57cdf673fa19a99d7cf57f (patch) | |
| tree | 84bdbb1a7f218b39753a32dbefb8858b12d06c23 | |
| parent | 04b8dcbbc3d5707f488c9b67ba96ce88ccd15181 (diff) | |
| download | AeroCore-OS-fc07365cdc27a2e78a57cdf673fa19a99d7cf57f.tar.gz AeroCore-OS-fc07365cdc27a2e78a57cdf673fa19a99d7cf57f.zip | |
Constrain builds to bazzite-deck
Keep the live installer Fedora version aligned with the deck base image and fail early if BASE_IMAGE is overridden to a non-deck variant.
| -rw-r--r-- | .github/workflows/build-live-installer.yml | 3 | ||||
| -rw-r--r-- | Containerfile | 2 | ||||
| -rwxr-xr-x | build_files/build.sh | 9 |
3 files changed, 12 insertions, 2 deletions
diff --git a/.github/workflows/build-live-installer.yml b/.github/workflows/build-live-installer.yml index b5fedb3..98441df 100644 --- a/.github/workflows/build-live-installer.yml +++ b/.github/workflows/build-live-installer.yml @@ -35,8 +35,9 @@ jobs: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} IMAGE_TAG: ${{ inputs.image_tag || 'latest' }} + # 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: "44" + FEDORA_VERSION: "43" steps: - name: Maximize build space diff --git a/Containerfile b/Containerfile index c9377ca..16e85a2 100644 --- a/Containerfile +++ b/Containerfile @@ -7,6 +7,7 @@ COPY system_files /system_files # Base Image FROM ${BASE_IMAGE} +ARG BASE_IMAGE ARG IMAGE_NAME="aerocore-os" ARG IMAGE_VENDOR="AeroCore-IO" ARG IMAGE_BRANCH="stable" @@ -16,7 +17,6 @@ ARG OSTREE_IMAGE_REF="" ## Other possible base images include: # ghcr.io/ublue-os/bazzite-deck:testing # ghcr.io/ublue-os/bazzite-deck:stable-43.20260420 -# ghcr.io/ublue-os/bazzite:stable ### [IM]MUTABLE /opt ## Some bootable images, like Fedora, have /opt symlinked to /var/opt, in order to diff --git a/build_files/build.sh b/build_files/build.sh index 3d37e31..03adff0 100755 --- a/build_files/build.sh +++ b/build_files/build.sh @@ -2,6 +2,15 @@ set -ouex pipefail +case "${BASE_IMAGE:-}" in + ghcr.io/ublue-os/bazzite-deck:* | ghcr.io/ublue-os/bazzite-deck@*) + ;; + *) + echo "AeroCore OS only supports bazzite-deck BASE_IMAGE values for HTPC game-mode builds: ${BASE_IMAGE:-<unset>}" >&2 + exit 1 + ;; +esac + # Copy the contents of system_files/ of the git repo to / cp -avf "/ctx/system_files"/. / |