diff options
| author | Tranch <tranch.xiao@gmail.com> | 2026-07-26 01:56:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-26 01:56:52 +0800 |
| commit | 2b2997019fee5a6e4e7bd8bc52879bf681c2e757 (patch) | |
| tree | ab88e46a34f75276326fce4c292fe63256252e5d /Justfile | |
| parent | b2e56858143df73d1f659b44a16939c3eb761d22 (diff) | |
| parent | 030fcab5bb353fdb7d7c18194476af5c6f0aa19c (diff) | |
| download | AeroCore-OS-2b2997019fee5a6e4e7bd8bc52879bf681c2e757.tar.gz AeroCore-OS-2b2997019fee5a6e4e7bd8bc52879bf681c2e757.zip | |
Merge pull request #11 from AeroCore-IO/testing
Add branch-aware versioned image tags
Diffstat (limited to 'Justfile')
| -rw-r--r-- | Justfile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -8,6 +8,9 @@ export image_keywords := env_var("IMAGE_KEYWORDS") export image_logo_url := env_var("IMAGE_LOGO_URL") export default_tag := env_var("DEFAULT_TAG") export bib_image := env_var("BIB_IMAGE") +export IMAGE_BRANCH := env_var_or_default("IMAGE_BRANCH", "stable") +export VERSION_TAG := env_var_or_default("VERSION_TAG", default_tag) +export VERSION_PRETTY := env_var_or_default("VERSION_PRETTY", VERSION_TAG) export BASE_IMAGE := env_var_or_default("BASE_IMAGE", "ghcr.io/ublue-os/bazzite-deck:stable") 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:43") @@ -126,7 +129,7 @@ build $target_image=image_name $tag=default_tag: BUILD_ARGS=() LABELS=() - 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 + for arg in BASE_IMAGE IMAGE_BRANCH VERSION_TAG VERSION_PRETTY FLATPAK_REMOTE_URL HOMEBREW_BOTTLE_DOMAIN HOMEBREW_API_DOMAIN OSTREE_IMAGE_REF INSTRUMENTS_ENABLED INSTRUMENTS_RELEASE_REPOSITORY INSTRUMENTS_VERSION INSTRUMENTS_RELEASE_API_BASE; do if [[ -n "${!arg:-}" ]]; then BUILD_ARGS+=("--build-arg" "${arg}=${!arg}") fi @@ -138,7 +141,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 |