summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortranch <tranch.xiao@gmail.com>2026-10-28 08:20:09 +0800
committertranch <tranch.xiao@gmail.com>2026-10-28 08:20:09 +0800
commit91163f198ee0ca7bf8909f8e088dedce486517df (patch)
treed39abf949bd51a2b065cbfba9cdf0cd8d6c711d5
parent7a995270d3752b261b9f15338e8dfe82597bdb97 (diff)
parent1dfea2360c7ff1c1394c9ffa4d62ceff62b93970 (diff)
downloadAeroCore-OS-91163f198ee0ca7bf8909f8e088dedce486517df.tar.gz
AeroCore-OS-91163f198ee0ca7bf8909f8e088dedce486517df.zip
Merge testing-44.20261027 into mainHEAD44.20261028main
* origin/testing: build: align testing with Bazzite 44.20261026
-rw-r--r--.github/workflows/build.yml6
-rw-r--r--Containerfile4
-rw-r--r--Justfile4
-rw-r--r--image-template.env2
4 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ffa1165..745cca4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ env:
IMAGE_LOGO_URL: ${{ vars.IMAGE_LOGO_URL || 'https://avatars.githubusercontent.com/u/120078124?s=200&v=4' }}
DEFAULT_TAG: ${{ vars.DEFAULT_TAG || 'stable' }}
BIB_IMAGE: ${{ vars.BIB_IMAGE || 'quay.io/centos-bootc/bootc-image-builder:latest' }}
- BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable-44.20261012.1' }}
+ BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable-44.20261026' }}
FLATPAK_REMOTE_URL: ${{ vars.FLATPAK_REMOTE_URL }}
HOMEBREW_BOTTLE_DOMAIN: ${{ vars.HOMEBREW_BOTTLE_DOMAIN }}
HOMEBREW_API_DOMAIN: ${{ vars.HOMEBREW_API_DOMAIN }}
@@ -95,7 +95,7 @@ jobs:
- name: Generate Version and Tags
id: gen-version
env:
- BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable-44.20261012.1' }}
+ BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable-44.20261026' }}
run: |
set -euo pipefail
@@ -162,7 +162,7 @@ jobs:
id: build-image
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable-44.20261012.1' }}
+ BASE_IMAGE: ${{ vars.BASE_IMAGE || 'ghcr.io/ublue-os/bazzite-deck:stable-44.20261026' }}
FLATPAK_REMOTE_URL: ${{ vars.FLATPAK_REMOTE_URL }}
HOMEBREW_BOTTLE_DOMAIN: ${{ vars.HOMEBREW_BOTTLE_DOMAIN }}
HOMEBREW_API_DOMAIN: ${{ vars.HOMEBREW_API_DOMAIN }}
diff --git a/Containerfile b/Containerfile
index 18606aa..b8bdc29 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,5 +1,5 @@
# Allow build scripts to be referenced without being copied into the final image
-ARG BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:stable-44.20261012.1"
+ARG BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:stable-44.20261026"
FROM scratch AS ctx
COPY build_files /
@@ -15,7 +15,7 @@ ARG VERSION_TAG="latest"
ARG VERSION_PRETTY="latest"
ARG OSTREE_IMAGE_REF=""
## Other possible base images include:
-# ghcr.io/ublue-os/bazzite-deck:stable-44.20261012.1
+# ghcr.io/ublue-os/bazzite-deck:stable-44.20261026
# ghcr.io/ublue-os/bazzite-deck:testing-44.202609019
### [IM]MUTABLE /opt
diff --git a/Justfile b/Justfile
index 8f89449..b4260f6 100644
--- a/Justfile
+++ b/Justfile
@@ -11,7 +11,7 @@ export bib_image := env_var("BIB_IMAGE")
export IMAGE_BRANCH := env_var_or_default("IMAGE_BRANCH", "testing-candidate")
export VERSION_TAG := env_var_or_default("VERSION_TAG", "")
export VERSION_PRETTY := env_var_or_default("VERSION_PRETTY", "")
-export BASE_IMAGE := env_var_or_default("BASE_IMAGE", "ghcr.io/ublue-os/bazzite-deck:stable-44.20261012.1")
+export BASE_IMAGE := env_var_or_default("BASE_IMAGE", "ghcr.io/ublue-os/bazzite-deck:stable-44.20261026")
export OSTREE_IMAGE_REF := env_var_or_default("OSTREE_IMAGE_REF", "ostree-image-signed:docker://ghcr.io/" + repo_organization + "/" + image_name)
export LIVE_BASE_IMAGE := env_var_or_default("LIVE_BASE_IMAGE", "quay.io/fedora/fedora-kinoite:44")
export TITANOBOA_REPOSITORY := env_var_or_default("TITANOBOA_REPOSITORY", "https://github.com/Zeglius/titanoboa.git")
@@ -137,7 +137,7 @@ build $target_image=image_name $tag=default_tag:
"--build-arg" "IMAGE_BRANCH={{ tag }}"
"--build-arg" "VERSION_TAG=${VERSION_TAG:-{{ tag }}}"
"--build-arg" "VERSION_PRETTY=${VERSION_PRETTY:-${VERSION_TAG:-{{ tag }}}}"
- "--label" "org.opencontainers.image.base.name=${BASE_IMAGE:-ghcr.io/ublue-os/bazzite-deck:stable-44.20261012.1}"
+ "--label" "org.opencontainers.image.base.name=${BASE_IMAGE:-ghcr.io/ublue-os/bazzite-deck:stable-44.20261026}"
)
for arg in BASE_IMAGE FLATPAK_REMOTE_URL HOMEBREW_BOTTLE_DOMAIN HOMEBREW_API_DOMAIN OSTREE_IMAGE_REF INSTRUMENTS_ENABLED INSTRUMENTS_RELEASE_REPOSITORY INSTRUMENTS_VERSION INSTRUMENTS_RELEASE_API_BASE; do
diff --git a/image-template.env b/image-template.env
index 27387e4..f4383ac 100644
--- a/image-template.env
+++ b/image-template.env
@@ -16,7 +16,7 @@ BIB_IMAGE="quay.io/centos-bootc/bootc-image-builder:latest"
# Keep this on bazzite-deck for Steam Deck, game mode, and handheld customizations.
# Use a concrete tag during transition windows if stable/testing moves underneath you.
-BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:stable-44.20261012.1"
+BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:stable-44.20261026"
# Optional mirror settings.
FLATPAK_REMOTE_URL=""