From a09c6dfd3c294ba2bd4a9df8f9c043b9aefaa0a0 Mon Sep 17 00:00:00 2001 From: tranch Date: Sun, 26 Jul 2026 01:23:31 +0800 Subject: Make stable the default image channel Keep latest as a main-branch alias while using Fedora/date versions for image metadata and release tags. --- .github/workflows/build.yml | 4 +++- Justfile | 2 +- image-template.env | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a59b2a..97bfd91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,11 +88,13 @@ jobs: VERSION_BASE="${FEDORA_VERSION}.$(date -u +%Y%m%d)" if [[ "${GITHUB_REF_NAME}" == "testing" ]]; then + DEFAULT_TAG="testing" VERSION_TAG="testing-${VERSION_BASE}" VERSION_PRETTY="Testing (F${VERSION_BASE})" IMAGE_BRANCH="testing" ALIAS_TAGS="${VERSION_TAG} testing testing-${FEDORA_VERSION}" else + DEFAULT_TAG="stable" VERSION_TAG="${VERSION_BASE}" VERSION_PRETTY="Stable (F${VERSION_BASE})" IMAGE_BRANCH="stable" @@ -100,7 +102,7 @@ jobs: fi { - echo "DEFAULT_TAG=${VERSION_TAG}" + echo "DEFAULT_TAG=${DEFAULT_TAG}" echo "IMAGE_BRANCH=${IMAGE_BRANCH}" echo "VERSION_TAG=${VERSION_TAG}" echo "VERSION_PRETTY=${VERSION_PRETTY}" diff --git a/Justfile b/Justfile index d3252c6..68939a1 100644 --- a/Justfile +++ b/Justfile @@ -140,7 +140,7 @@ build $target_image=image_name $tag=default_tag: LABELS+=("--label" "org.opencontainers.image.documentation=https://raw.githubusercontent.com/{{ repo_organization }}/{{ image_name }}/${GIT_SHA}/README.md") LABELS+=("--label" "org.opencontainers.image.source=https://github.com/{{ repo_organization }}/{{ image_name }}/blob/${GIT_SHA}/Containerfile") LABELS+=("--label" "org.opencontainers.image.url=https://github.com/{{ repo_organization }}/{{ image_name }}/tree/${GIT_SHA}") - LABELS+=("--label" "org.opencontainers.image.version={{ default_tag }}.$(date +%Y%m%d)-${GIT_SHA}") + LABELS+=("--label" "org.opencontainers.image.version={{ version_tag }}.$(date +%Y%m%d)-${GIT_SHA}") fi # Image metadata for https://artifacthub.io/ - This is optional but is highly recommended so we all can get a index of all the custom images diff --git a/image-template.env b/image-template.env index 3035db5..22a387b 100644 --- a/image-template.env +++ b/image-template.env @@ -11,7 +11,7 @@ IMAGE_KEYWORDS="bootc,oci,linux,bazzite,steam-deck,aerocore" # Put your own image here for a fancy profile on https://artifacthub.io/! IMAGE_LOGO_URL="https://avatars.githubusercontent.com/u/120078124?s=200&v=4" -DEFAULT_TAG="latest" +DEFAULT_TAG="stable" BIB_IMAGE="quay.io/centos-bootc/bootc-image-builder:latest" # Keep this on bazzite-deck for Steam Deck, game mode, and handheld customizations. -- cgit v1.2.3