From f3369d582ed445405d165f84db0e5a375a169d8c Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sat, 26 Aug 2023 11:13:59 -0500 Subject: feat: first pass at a simple downstream build --- Containerfile | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Containerfile (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile new file mode 100644 index 0000000..6ffa096 --- /dev/null +++ b/Containerfile @@ -0,0 +1,46 @@ +### 1. BUILD ARGS +## IMAGE_NAME arg can be anything from ublue upstream: silverblue, kinoite, sericea, vauxite, mate, lxqt, base +ARG IMAGE_NAME="silverblue" +## IMAGE_SUFFIX arg should be "main", nvidia users should use "nvidia" +ARG IMAGE_SUFFIX="main" +## FEDORA_MAJOR_VERSION arg must be a version built by ublue: 37 or 38 as of today +ARG FEDORA_MAJOR_VERSION="38" +## NVIDIA_MAJOR_VERSION should only be changed if the user needs a specific nvidia driver version +## if needing driver 535, this should be set to "-535". It is important to include the hyphen +ARG NVIDIA_MAJOR_VERSION="" + + +### 2. SOURCE IMAGE +## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image +FROM ghcr.io/ublue-os/${IMAGE_NAME}-${IMAGE_SUFFIX}:${FEDORA_MAJOR_VERSION}${NVIDIA_MAJOR_VERSION} + + +### 3. PRE-MODIFICATIONS +## this directory is needed to prevent failure with some RPM installs +RUN mkdir -p /var/lib/alternatives + + +### 4. MODIFICATIONS +## make modifications desired in your image and install packages here, a few examples follow + +# install a package from standard fedora repo +RUN rpm-ostree install screen + +# install a package from rpmfusion repo +RUN rpm-ostree install vlc + +# static binaries can sometimes by added using a COPY directive like these below. +COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl +#COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose + +# modify default timeouts on system to prevent slow reboots from services that won't stop +RUN sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \ + sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf + + +### 5. POST-MODIFICATIONS +## these commands leave the image in a clean state after local modifications +RUN rm -rf /tmp/* /var/* && \ + ostree container commit && \ + mkdir -p /tmp /var/tmp && \ + chmod 1777 /tmp /var/tmp -- cgit v1.2.3 From 288294e0995a900ddf273fafa20cfc34d2736f6e Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sat, 26 Aug 2023 19:55:59 -0500 Subject: feat: add github actions build workflow --- Containerfile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 6ffa096..e51bd8e 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,9 @@ ### 1. BUILD ARGS +## These enable the produced image to be different by passing different build args. +## They are provided on the commandline when building in a terminal, but the github +## workflow provides them when building in Github Actions. Changes to the workflow +## build.xml will override changes here. + ## IMAGE_NAME arg can be anything from ublue upstream: silverblue, kinoite, sericea, vauxite, mate, lxqt, base ARG IMAGE_NAME="silverblue" ## IMAGE_SUFFIX arg should be "main", nvidia users should use "nvidia" -- cgit v1.2.3 From 9135f2ddeb003cf96a2b711c89ffae657ac3cf5f Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sat, 26 Aug 2023 20:09:48 -0500 Subject: refactor: simplify some variable names --- Containerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index e51bd8e..caa8a00 100644 --- a/Containerfile +++ b/Containerfile @@ -4,20 +4,20 @@ ## workflow provides them when building in Github Actions. Changes to the workflow ## build.xml will override changes here. -## IMAGE_NAME arg can be anything from ublue upstream: silverblue, kinoite, sericea, vauxite, mate, lxqt, base -ARG IMAGE_NAME="silverblue" -## IMAGE_SUFFIX arg should be "main", nvidia users should use "nvidia" -ARG IMAGE_SUFFIX="main" -## FEDORA_MAJOR_VERSION arg must be a version built by ublue: 37 or 38 as of today -ARG FEDORA_MAJOR_VERSION="38" -## NVIDIA_MAJOR_VERSION should only be changed if the user needs a specific nvidia driver version +## SOURCE_IMAGE arg can be anything from ublue upstream: silverblue, kinoite, sericea, vauxite, mate, lxqt, base +ARG SOURCE_IMAGE="silverblue" +## SOURCE_SUFFIX arg should be "main", nvidia users should use "nvidia" +ARG SOURCE_SUFFIX="main" +## FEDORA_VERSION arg must be a version built by ublue: 37 or 38 as of today +ARG FEDORA_VERSION="38" +## NVIDIA_VERSION should only be changed if the user needs a specific nvidia driver version ## if needing driver 535, this should be set to "-535". It is important to include the hyphen -ARG NVIDIA_MAJOR_VERSION="" +ARG NVIDIA_VERSION="" ### 2. SOURCE IMAGE ## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image -FROM ghcr.io/ublue-os/${IMAGE_NAME}-${IMAGE_SUFFIX}:${FEDORA_MAJOR_VERSION}${NVIDIA_MAJOR_VERSION} +FROM ghcr.io/ublue-os/${SOURCE_IMAGE}-${SOURCE_SUFFIX}:${FEDORA_VERSION}${NVIDIA_VERSION} ### 3. PRE-MODIFICATIONS -- cgit v1.2.3 From e2c190e0301df8ed229471c78e691f2c166e53b3 Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Sun, 3 Mar 2024 11:40:37 -0600 Subject: feat: Added additional information in base containerfile --- Containerfile | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index caa8a00..6e4bc6e 100644 --- a/Containerfile +++ b/Containerfile @@ -2,16 +2,21 @@ ## These enable the produced image to be different by passing different build args. ## They are provided on the commandline when building in a terminal, but the github ## workflow provides them when building in Github Actions. Changes to the workflow -## build.xml will override changes here. +## build.yml will override changes here. -## SOURCE_IMAGE arg can be anything from ublue upstream: silverblue, kinoite, sericea, vauxite, mate, lxqt, base +## SOURCE_IMAGE arg can be anything from ublue upstream: silverblue, kinoite, sericea, base +## See list here: https://github.com/orgs/ublue-os/packages?repo_name=main ARG SOURCE_IMAGE="silverblue" + ## SOURCE_SUFFIX arg should be "main", nvidia users should use "nvidia" ARG SOURCE_SUFFIX="main" + ## FEDORA_VERSION arg must be a version built by ublue: 37 or 38 as of today -ARG FEDORA_VERSION="38" +ARG FEDORA_VERSION="39" + ## NVIDIA_VERSION should only be changed if the user needs a specific nvidia driver version -## if needing driver 535, this should be set to "-535". It is important to include the hyphen +## This will depend on your hardware and the version of the driver that supports it. +## if needing driver 470, this should be set to "-470". It is important to include the hyphen ARG NVIDIA_VERSION="" @@ -21,6 +26,8 @@ FROM ghcr.io/ublue-os/${SOURCE_IMAGE}-${SOURCE_SUFFIX}:${FEDORA_VERSION}${NVIDIA ### 3. PRE-MODIFICATIONS +## This section is meant for any modifications to the image before the main modifications are made. + ## this directory is needed to prevent failure with some RPM installs RUN mkdir -p /var/lib/alternatives @@ -28,24 +35,32 @@ RUN mkdir -p /var/lib/alternatives ### 4. MODIFICATIONS ## make modifications desired in your image and install packages here, a few examples follow -# install a package from standard fedora repo -RUN rpm-ostree install screen +#### Install packages -# install a package from rpmfusion repo +# install a package from standard fedora repo or rpmfusion repo +# RPMfusion packages are available by default in ublue main images +# List of rpmfusion packages can be found here: +# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1 +RUN rpm-ostree install screen +# exmaple package from rpmfusion RUN rpm-ostree install vlc +#### Installation of static binaries + # static binaries can sometimes by added using a COPY directive like these below. COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl -#COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose +# COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose + +#### Change to System Configuration Files # modify default timeouts on system to prevent slow reboots from services that won't stop RUN sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \ - sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf + sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf ### 5. POST-MODIFICATIONS ## these commands leave the image in a clean state after local modifications RUN rm -rf /tmp/* /var/* && \ - ostree container commit && \ - mkdir -p /tmp /var/tmp && \ - chmod 1777 /tmp /var/tmp + ostree container commit && \ + mkdir -p /tmp /var/tmp && \ + chmod 1777 /tmp /var/tmp -- cgit v1.2.3 From 345382f4967754ec17fd6661a21273af5f887ae7 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Fri, 12 Apr 2024 15:34:52 -0500 Subject: chore: cleanup Containerfile args & comments --- Containerfile | 61 +++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 21 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 6e4bc6e..da1dad9 100644 --- a/Containerfile +++ b/Containerfile @@ -1,28 +1,47 @@ -### 1. BUILD ARGS -## These enable the produced image to be different by passing different build args. -## They are provided on the commandline when building in a terminal, but the github -## workflow provides them when building in Github Actions. Changes to the workflow -## build.yml will override changes here. - -## SOURCE_IMAGE arg can be anything from ublue upstream: silverblue, kinoite, sericea, base -## See list here: https://github.com/orgs/ublue-os/packages?repo_name=main +## 1. BUILD ARGS +# These allow changing the produced image by passing different build args to adjust +# the source from which your image is built. +# Build args can be provided on the commandline when building locally with: +# podman build -f Containerfile --build-arg FEDORA_VERSION=40 -t local-image + +# SOURCE_IMAGE arg can be anything from ublue upstream which matches your desired version: +# See list here: https://github.com/orgs/ublue-os/packages?repo_name=main +# - "silverblue" +# - "kinoite" +# - "sericea" +# - "onyx" +# - "lazurite" +# - "vauxite" +# - "base" +# +# "aurora", "bazzite", "bluefin" or "ucore" may also be used but have different suffixes. ARG SOURCE_IMAGE="silverblue" -## SOURCE_SUFFIX arg should be "main", nvidia users should use "nvidia" -ARG SOURCE_SUFFIX="main" - -## FEDORA_VERSION arg must be a version built by ublue: 37 or 38 as of today +## SOURCE_SUFFIX arg should include a hyphen and the appropriate suffix name +# These examples all work for silverblue/kinoite/sericea/onyx/lazurite/vauxite/base +# - "-main" +# - "-nvidia" +# - "-asus" +# - "-asus-nvidia" +# - "-surface" +# - "-surface-nvidia" +# +# aurora, bazzite and bluefin each have unique suffixes. Please check the specific image. +# ucore has the following possible suffixes +# - stable +# - stable-nvidia +# - stable-zfs +# - stable-nvidia-zfs +# - (and the above with testing rather than stable) +ARG SOURCE_SUFFIX="-main" + +## FEDORA_VERSION arg must be a version built by ublue: eg, 39 or 40 ARG FEDORA_VERSION="39" -## NVIDIA_VERSION should only be changed if the user needs a specific nvidia driver version -## This will depend on your hardware and the version of the driver that supports it. -## if needing driver 470, this should be set to "-470". It is important to include the hyphen -ARG NVIDIA_VERSION="" - ### 2. SOURCE IMAGE ## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image -FROM ghcr.io/ublue-os/${SOURCE_IMAGE}-${SOURCE_SUFFIX}:${FEDORA_VERSION}${NVIDIA_VERSION} +FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${FEDORA_VERSION} ### 3. PRE-MODIFICATIONS @@ -42,14 +61,14 @@ RUN mkdir -p /var/lib/alternatives # List of rpmfusion packages can be found here: # https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1 RUN rpm-ostree install screen -# exmaple package from rpmfusion -RUN rpm-ostree install vlc +# example package from rpmfusion +#RUN rpm-ostree install vlc #### Installation of static binaries # static binaries can sometimes by added using a COPY directive like these below. COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl -# COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose +#COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose #### Change to System Configuration Files -- cgit v1.2.3 From e617e14dd0db5eb05613506cd37e0bef948f4f9d Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 14 Apr 2024 22:27:36 -0700 Subject: fix: clarify ostree container commit must be used (#4) * fix: clarify ostree container commit must be used after each RUN * chore: use a bash script and simplify Containerfile --------- Co-authored-by: Benjamin Sherman --- Containerfile | 52 +++++++++++++--------------------------------------- 1 file changed, 13 insertions(+), 39 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index da1dad9..b4cbcce 100644 --- a/Containerfile +++ b/Containerfile @@ -44,42 +44,16 @@ ARG FEDORA_VERSION="39" FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${FEDORA_VERSION} -### 3. PRE-MODIFICATIONS -## This section is meant for any modifications to the image before the main modifications are made. - -## this directory is needed to prevent failure with some RPM installs -RUN mkdir -p /var/lib/alternatives - - -### 4. MODIFICATIONS -## make modifications desired in your image and install packages here, a few examples follow - -#### Install packages - -# install a package from standard fedora repo or rpmfusion repo -# RPMfusion packages are available by default in ublue main images -# List of rpmfusion packages can be found here: -# https://mirrors.rpmfusion.org/mirrorlist?path=free/fedora/updates/39/x86_64/repoview/index.html&protocol=https&redirect=1 -RUN rpm-ostree install screen -# example package from rpmfusion -#RUN rpm-ostree install vlc - -#### Installation of static binaries - -# static binaries can sometimes by added using a COPY directive like these below. -COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl -#COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker-compose - -#### Change to System Configuration Files - -# modify default timeouts on system to prevent slow reboots from services that won't stop -RUN sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \ - sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf - - -### 5. POST-MODIFICATIONS -## these commands leave the image in a clean state after local modifications -RUN rm -rf /tmp/* /var/* && \ - ostree container commit && \ - mkdir -p /tmp /var/tmp && \ - chmod 1777 /tmp /var/tmp +### 3. MODIFICATIONS +## make modifications desired in your image and install packages by modifying the build.sh script +## the following RUN directive does all the things required to run "build.sh" as recommended. + +COPY build.sh /tmp/build.sh + +RUN mkdir -p /var/lib/alternatives && \ + /tmp/build.sh && \ + ostree container commit +## NOTES: +# - /var/lib/alternatives is required to prevent failure with some RPM installs +# - All RUN commands must end with ostree container commit +# see: https://coreos.github.io/rpm-ostree/container/#using-ostree-container-commit -- cgit v1.2.3 From 97069176d8f800786f038b9b161677e976925f3b Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Mon, 22 Apr 2024 23:05:49 -0500 Subject: refactor: use repo name as default image name (#7) Also makes the source image's tag easier to understand in the Containerfile. --- Containerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index b4cbcce..5d08ad5 100644 --- a/Containerfile +++ b/Containerfile @@ -35,13 +35,13 @@ ARG SOURCE_IMAGE="silverblue" # - (and the above with testing rather than stable) ARG SOURCE_SUFFIX="-main" -## FEDORA_VERSION arg must be a version built by ublue: eg, 39 or 40 -ARG FEDORA_VERSION="39" +## SOURCE_TAG arg must be a version built for the specific image: eg, 39, 40, gts, latest +ARG SOURCE_TAG="latest" ### 2. SOURCE IMAGE ## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image -FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${FEDORA_VERSION} +FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${SOURCE_TAG} ### 3. MODIFICATIONS -- cgit v1.2.3 From 9c8a21c247397203cd82b52c33ede0cac27df3a7 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Sat, 4 Jan 2025 16:49:50 -0500 Subject: feat: simplify template (#44) --- Containerfile | 65 ++++++++++++----------------------------------------------- 1 file changed, 13 insertions(+), 52 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 5d08ad5..c30c336 100644 --- a/Containerfile +++ b/Containerfile @@ -1,50 +1,15 @@ -## 1. BUILD ARGS -# These allow changing the produced image by passing different build args to adjust -# the source from which your image is built. -# Build args can be provided on the commandline when building locally with: -# podman build -f Containerfile --build-arg FEDORA_VERSION=40 -t local-image - -# SOURCE_IMAGE arg can be anything from ublue upstream which matches your desired version: -# See list here: https://github.com/orgs/ublue-os/packages?repo_name=main -# - "silverblue" -# - "kinoite" -# - "sericea" -# - "onyx" -# - "lazurite" -# - "vauxite" -# - "base" -# -# "aurora", "bazzite", "bluefin" or "ucore" may also be used but have different suffixes. -ARG SOURCE_IMAGE="silverblue" - -## SOURCE_SUFFIX arg should include a hyphen and the appropriate suffix name -# These examples all work for silverblue/kinoite/sericea/onyx/lazurite/vauxite/base -# - "-main" -# - "-nvidia" -# - "-asus" -# - "-asus-nvidia" -# - "-surface" -# - "-surface-nvidia" -# -# aurora, bazzite and bluefin each have unique suffixes. Please check the specific image. -# ucore has the following possible suffixes -# - stable -# - stable-nvidia -# - stable-zfs -# - stable-nvidia-zfs -# - (and the above with testing rather than stable) -ARG SOURCE_SUFFIX="-main" - -## SOURCE_TAG arg must be a version built for the specific image: eg, 39, 40, gts, latest -ARG SOURCE_TAG="latest" - - -### 2. SOURCE IMAGE -## this is a standard Containerfile FROM using the build ARGs above to select the right upstream image -FROM ghcr.io/ublue-os/${SOURCE_IMAGE}${SOURCE_SUFFIX}:${SOURCE_TAG} - - -### 3. MODIFICATIONS +FROM ghcr.io/ublue-os/ublue-os/silverblue-main:latest + +## Other possible base images include: +# FROM ghcr.io/ublue-os/bazzite:stable +# FROM ghcr.io/ublue-os/bluefin-nvidia:stable +# +# ... and so on, here are more base images +# Universal Blue Images: https://github.com/orgs/ublue-os/packages +# Fedora base image: quay.io/fedora/fedora-bootc:41 +# CentOS base images: quay.io/centos-bootc/centos-bootc:stream10 + +### MODIFICATIONS ## make modifications desired in your image and install packages by modifying the build.sh script ## the following RUN directive does all the things required to run "build.sh" as recommended. @@ -52,8 +17,4 @@ COPY build.sh /tmp/build.sh RUN mkdir -p /var/lib/alternatives && \ /tmp/build.sh && \ - ostree container commit -## NOTES: -# - /var/lib/alternatives is required to prevent failure with some RPM installs -# - All RUN commands must end with ostree container commit -# see: https://coreos.github.io/rpm-ostree/container/#using-ostree-container-commit + ostree container lint -- cgit v1.2.3 From 688e93caaa8f2fc2f8a1f2446719740978f7f3f5 Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Sat, 4 Jan 2025 18:54:57 -0300 Subject: chore: add ostree container commit there and fix bootc typo (#45) --- Containerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index c30c336..94354eb 100644 --- a/Containerfile +++ b/Containerfile @@ -17,4 +17,6 @@ COPY build.sh /tmp/build.sh RUN mkdir -p /var/lib/alternatives && \ /tmp/build.sh && \ - ostree container lint + ostree container commit && \ + bootc container lint + -- cgit v1.2.3 From fdb05d7df8058a6db4cb1032be52242cc5a15f48 Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Wed, 8 Jan 2025 21:15:28 -0300 Subject: fix: use IMAGE_NAME and IMAGE_DESC for variables + fix typo in containerfile (#51) --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 94354eb..fd30687 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/ublue-os/ublue-os/silverblue-main:latest +FROM ghcr.io/ublue-os/silverblue-main:latest ## Other possible base images include: # FROM ghcr.io/ublue-os/bazzite:stable -- cgit v1.2.3 From 0d70795fe4e1f9bb93d3c075f6f4aabca7b29227 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 26 Jan 2025 16:42:34 +0000 Subject: fix: remove bootc container lint check (#63) This requires Composefs to be used, which we are not yet in a position to enable. --- Containerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index fd30687..67bd49c 100644 --- a/Containerfile +++ b/Containerfile @@ -17,6 +17,5 @@ COPY build.sh /tmp/build.sh RUN mkdir -p /var/lib/alternatives && \ /tmp/build.sh && \ - ostree container commit && \ - bootc container lint + ostree container commit -- cgit v1.2.3 From a4833543c88aa3fa791302666cafe72b12d57735 Mon Sep 17 00:00:00 2001 From: James Reilly Date: Wed, 12 Mar 2025 22:07:17 +0530 Subject: Fix: Update Justfile (#76) * Fix: Update Justfile Updated to match the Bluefin LTS one. Stripped the iso customizations stuff * fix: update Containerfile ublue-os/silverblue-main:latest shouldn't be the default --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 67bd49c..80b04aa 100644 --- a/Containerfile +++ b/Containerfile @@ -1,7 +1,7 @@ -FROM ghcr.io/ublue-os/silverblue-main:latest +FROM ghcr.io/ublue-os/bazzite:stable ## Other possible base images include: -# FROM ghcr.io/ublue-os/bazzite:stable +# FROM ghcr.io/ublue-os/bazzite:latest # FROM ghcr.io/ublue-os/bluefin-nvidia:stable # # ... and so on, here are more base images -- cgit v1.2.3 From 5bdea6ca89365bf05459ffc249d73116871dbbb9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Mar 2025 14:32:51 -0400 Subject: chore(deps): pin dependencies (#85) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 80b04aa..4c16910 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/ublue-os/bazzite:stable +FROM ghcr.io/ublue-os/bazzite:stable@sha256:b0655252e3d7b53d7c3b4469e4d84635341b991c22a11fb0dc85dba802f9cb27 ## Other possible base images include: # FROM ghcr.io/ublue-os/bazzite:latest -- cgit v1.2.3 From 04a3a8f576fdf24abaac2a46ad60ee442716c10d Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Sat, 15 Mar 2025 16:02:07 -0300 Subject: ci: use the same renovate config as bluefin-lts (#86) * ci: use the same renovate config as bluefin-lts This one makes it so we (and people that use this template) dont need to manually bump the docker images all the time, like we ran into with [bluefin LTS](https://github.com/ublue-os/bluefin-lts/pull/398#issuecomment-2726873005) * fix: also remove the pin on Containerfile --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 4c16910..80b04aa 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/ublue-os/bazzite:stable@sha256:b0655252e3d7b53d7c3b4469e4d84635341b991c22a11fb0dc85dba802f9cb27 +FROM ghcr.io/ublue-os/bazzite:stable ## Other possible base images include: # FROM ghcr.io/ublue-os/bazzite:latest -- cgit v1.2.3 From ed7ec5dff8b87c89223056d9f6c231577fe238b6 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 22 Mar 2025 15:15:36 -0700 Subject: feat: Use bind mounts to keep final image clean (#92) --- Containerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 80b04aa..015dfaf 100644 --- a/Containerfile +++ b/Containerfile @@ -15,7 +15,9 @@ FROM ghcr.io/ublue-os/bazzite:stable COPY build.sh /tmp/build.sh -RUN mkdir -p /var/lib/alternatives && \ +RUN --mount=type=cache,dst=/var/cache \ + --mount=type=cache,dst=/var/log \ + --mount=type=tmpfs,dst=/tmp \ /tmp/build.sh && \ ostree container commit -- cgit v1.2.3 From 4cebc1656fdd3a1f1e06b9e912ffea0028c37f54 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 22 Mar 2025 15:18:22 -0700 Subject: feat: Avoid copying build files into image, add option for linting (#93) --- Containerfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 015dfaf..69550ff 100644 --- a/Containerfile +++ b/Containerfile @@ -1,3 +1,8 @@ +# Allow build scripts to be referenced without being copied into the final image +FROM scratch AS ctx +COPY build_files / + +# Base Image FROM ghcr.io/ublue-os/bazzite:stable ## Other possible base images include: @@ -13,11 +18,14 @@ FROM ghcr.io/ublue-os/bazzite:stable ## make modifications desired in your image and install packages by modifying the build.sh script ## the following RUN directive does all the things required to run "build.sh" as recommended. -COPY build.sh /tmp/build.sh - -RUN --mount=type=cache,dst=/var/cache \ +RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ + --mount=type=cache,dst=/var/cache \ --mount=type=cache,dst=/var/log \ --mount=type=tmpfs,dst=/tmp \ - /tmp/build.sh && \ + /ctx/build.sh && \ ostree container commit +### LINTING +## Verify final image and contents are correct. +## This can be quite sensitive, so it's disabled by default. +# RUN bootc container lint \ No newline at end of file -- cgit v1.2.3 From 38714541bcf8e3df38226e0131693b6b5a6c5ad0 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 25 Mar 2025 14:23:04 -0700 Subject: feat: Enable linting by default (#95) --- Containerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 69550ff..d57ee46 100644 --- a/Containerfile +++ b/Containerfile @@ -27,5 +27,4 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ ### LINTING ## Verify final image and contents are correct. -## This can be quite sensitive, so it's disabled by default. -# RUN bootc container lint \ No newline at end of file +RUN bootc container lint \ No newline at end of file -- cgit v1.2.3 From a71ba50e4c6d6a4160c335066a16a403828a491b Mon Sep 17 00:00:00 2001 From: Clement Verna <7237866+cverna@users.noreply.github.com> Date: Sun, 28 Sep 2025 00:55:44 +0200 Subject: Containerfile: ostree container commit is not needed (#137) ostree container commit is not needed anymore when using bootc container lint. Signed-off-by: Clement Verna --- Containerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index d57ee46..8064002 100644 --- a/Containerfile +++ b/Containerfile @@ -22,9 +22,8 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/cache \ --mount=type=cache,dst=/var/log \ --mount=type=tmpfs,dst=/tmp \ - /ctx/build.sh && \ - ostree container commit + /ctx/build.sh ### LINTING ## Verify final image and contents are correct. -RUN bootc container lint \ No newline at end of file +RUN bootc container lint -- cgit v1.2.3 From 52561b2b46d159f6d648d25abeca6fbae760cc3b Mon Sep 17 00:00:00 2001 From: Zeglius <33781398+Zeglius@users.noreply.github.com> Date: Tue, 21 Oct 2025 17:38:28 +0200 Subject: feat: allows packages to install in /opt (#150) * feat: allows packages to install in /opt/ * feat: default to mutable opt and add documentation Signed-off-by: Zeglius <33781398+Zeglius@users.noreply.github.com> --------- Signed-off-by: Zeglius <33781398+Zeglius@users.noreply.github.com> Co-authored-by: stevensko <30204691+stevensko@users.noreply.github.com> --- Containerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 8064002..4cab82b 100644 --- a/Containerfile +++ b/Containerfile @@ -14,6 +14,17 @@ FROM ghcr.io/ublue-os/bazzite:stable # Fedora base image: quay.io/fedora/fedora-bootc:41 # CentOS base images: quay.io/centos-bootc/centos-bootc:stream10 +### [IM]MUTABLE /opt +## Some bootable images, like Fedora, have /opt symlinked to /var/opt, in order to +## make it mutable/writable for users. However, some packages write files to this directory, +## thus its contents might be wiped out when bootc deploys an image, making it troublesome for +## some packages. Eg, google-chrome, docker-desktop. +## +## Uncomment the following line if one desires to make /opt immutable and be able to be used +## by the package manager. + +# RUN rm /opt && mkdir /opt + ### MODIFICATIONS ## make modifications desired in your image and install packages by modifying the build.sh script ## the following RUN directive does all the things required to run "build.sh" as recommended. -- cgit v1.2.3 From a65bb3da1f7c5ed04ac3d8b5f69878c5ecee14ea Mon Sep 17 00:00:00 2001 From: renner <80410025+renner0e@users.noreply.github.com> Date: Wed, 17 Jun 2026 16:16:34 +0200 Subject: refactor: rewrite in just, saner defaults (#218) * refactor: rewrite in just, saner defaults I think it makes sense to do this as it is longterm easier to maintain, locally iterate and extend. Documents how to rebase to a local image, it pains me greatly when people iterate on github and wait forever for things to build and then to download the image for trivial things they could also quickly do locally. Rpm-ostree rechunker by default instead of opt-in legacy-rechunker, chunkah is also available if people want to use it already, if we deem it ready then we can enable it later on. They can all be opted-out of. Have a way to copy files to /{usr,etc} by default. We should sign the digest of the image instead of the tag. Co-Authored-by: a lot of sugar and bad music * docs: bump fedora-bootc version Co-authored-by: Jill Fiore * fix: formatting inconsistency Co-authored-by: Jill Fiore * docs: remove variable mentions from workflows These are now defined in the image-template.env file * fix: small nits in labels Co-authored-by: Adam Fidel --------- Co-authored-by: Jill Fiore Co-authored-by: Adam Fidel --- Containerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 4cab82b..f3bbf77 100644 --- a/Containerfile +++ b/Containerfile @@ -1,17 +1,18 @@ # Allow build scripts to be referenced without being copied into the final image FROM scratch AS ctx COPY build_files / +COPY system_files /system_files # Base Image FROM ghcr.io/ublue-os/bazzite:stable - ## Other possible base images include: -# FROM ghcr.io/ublue-os/bazzite:latest -# FROM ghcr.io/ublue-os/bluefin-nvidia:stable +# FROM ghcr.io/ublue-os/bazzite:testing +# FROM ghcr.io/ublue-os/aurora:stable +# FROM ghcr.io/ublue-os/bluefin-nvidia-open:stable # # ... and so on, here are more base images # Universal Blue Images: https://github.com/orgs/ublue-os/packages -# Fedora base image: quay.io/fedora/fedora-bootc:41 +# Fedora base image: quay.io/fedora/fedora-bootc:44 # CentOS base images: quay.io/centos-bootc/centos-bootc:stream10 ### [IM]MUTABLE /opt @@ -34,7 +35,7 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/log \ --mount=type=tmpfs,dst=/tmp \ /ctx/build.sh - + ### LINTING ## Verify final image and contents are correct. RUN bootc container lint -- cgit v1.2.3 From bdbe3c0defc4dd587ac933774b7d36f31338c1e6 Mon Sep 17 00:00:00 2001 From: "ubot-7274[bot]" <217212047+ubot-7274[bot]@users.noreply.github.com> Date: Sat, 20 Jun 2026 03:05:27 +0000 Subject: chore(deps): pin dependencies (#230) Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index f3bbf77..6db705a 100644 --- a/Containerfile +++ b/Containerfile @@ -4,7 +4,7 @@ COPY build_files / COPY system_files /system_files # Base Image -FROM ghcr.io/ublue-os/bazzite:stable +FROM ghcr.io/ublue-os/bazzite:stable@sha256:b923f92d5a5b59eb992e269383eba2744601052da9d3d1595f76e79aa6ce2df0 ## Other possible base images include: # FROM ghcr.io/ublue-os/bazzite:testing # FROM ghcr.io/ublue-os/aurora:stable -- cgit v1.2.3 From ed40e44b610cac878f17fa4233d8e3d19b8d67bb Mon Sep 17 00:00:00 2001 From: tranch Date: Thu, 9 Jul 2026 16:53:52 +0800 Subject: Configure AeroCore image mirrors Add build-time mirror configuration for Flatpak and Homebrew, expose the related build args, and install an AeroCore-owned profile script to load mirror environment files. Rename the mirror configuration files from the Bazzite-prefixed names to AeroCore-prefixed names while keeping the upstream Bazzite helper reference intact. Verification: bash -n system_files/etc/profile.d/aerocore-mirrors.sh && bash -n build_files/build.sh --- Containerfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 6db705a..976da0c 100644 --- a/Containerfile +++ b/Containerfile @@ -1,19 +1,16 @@ # Allow build scripts to be referenced without being copied into the final image +ARG BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:stable" + FROM scratch AS ctx COPY build_files / COPY system_files /system_files # Base Image -FROM ghcr.io/ublue-os/bazzite:stable@sha256:b923f92d5a5b59eb992e269383eba2744601052da9d3d1595f76e79aa6ce2df0 +FROM ${BASE_IMAGE} ## Other possible base images include: -# FROM ghcr.io/ublue-os/bazzite:testing -# FROM ghcr.io/ublue-os/aurora:stable -# FROM ghcr.io/ublue-os/bluefin-nvidia-open:stable -# -# ... and so on, here are more base images -# Universal Blue Images: https://github.com/orgs/ublue-os/packages -# Fedora base image: quay.io/fedora/fedora-bootc:44 -# CentOS base images: quay.io/centos-bootc/centos-bootc:stream10 +# 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 @@ -30,6 +27,10 @@ FROM ghcr.io/ublue-os/bazzite:stable@sha256:b923f92d5a5b59eb992e269383eba2744601 ## make modifications desired in your image and install packages by modifying the build.sh script ## the following RUN directive does all the things required to run "build.sh" as recommended. +ARG FLATPAK_REMOTE_URL="" +ARG HOMEBREW_BOTTLE_DOMAIN="" +ARG HOMEBREW_API_DOMAIN="" + RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/cache \ --mount=type=cache,dst=/var/log \ -- cgit v1.2.3 From 739b2e36ca393a8f9452280ac86bd59390df0c7a Mon Sep 17 00:00:00 2001 From: tranch Date: Fri, 10 Jul 2026 18:59:48 +0800 Subject: Complete OS rename metadata migration Move the image metadata and desktop naming to the new AeroCore OS\nidentity, and wire the build so the generated os-release data is\nwritten during image construction. --- Containerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 976da0c..7e029a4 100644 --- a/Containerfile +++ b/Containerfile @@ -7,6 +7,11 @@ COPY system_files /system_files # Base Image FROM ${BASE_IMAGE} +ARG IMAGE_NAME="aerocore-bazzite-image" +ARG IMAGE_VENDOR="AeroCore-IO" +ARG IMAGE_BRANCH="stable" +ARG VERSION_TAG="latest" +ARG VERSION_PRETTY="latest" ## Other possible base images include: # ghcr.io/ublue-os/bazzite-deck:testing # ghcr.io/ublue-os/bazzite-deck:stable-43.20260420 @@ -35,7 +40,8 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/cache \ --mount=type=cache,dst=/var/log \ --mount=type=tmpfs,dst=/tmp \ - /ctx/build.sh + /ctx/build.sh && \ + /ctx/image-info ### LINTING ## Verify final image and contents are correct. -- cgit v1.2.3 From 7280cc006eefe14a71ee19a66bc8b2c6d55c4887 Mon Sep 17 00:00:00 2001 From: tranch Date: Sun, 12 Jul 2026 19:52:33 +0800 Subject: chore: rename image name Change IMAGE_NAEME to aerocore-os --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 7e029a4..cdcd945 100644 --- a/Containerfile +++ b/Containerfile @@ -7,7 +7,7 @@ COPY system_files /system_files # Base Image FROM ${BASE_IMAGE} -ARG IMAGE_NAME="aerocore-bazzite-image" +ARG IMAGE_NAME="aerocore-os" ARG IMAGE_VENDOR="AeroCore-IO" ARG IMAGE_BRANCH="stable" ARG VERSION_TAG="latest" -- cgit v1.2.3 From 84df0042ca51743e2ef228d25a664a139ce8f9b3 Mon Sep 17 00:00:00 2001 From: tranch Date: Sun, 12 Jul 2026 23:35:37 +0800 Subject: Rebuild initramfs with custom branding Regenerate initramfs after applying AeroCore image metadata and assets. --- Containerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index cdcd945..1f09ba1 100644 --- a/Containerfile +++ b/Containerfile @@ -41,7 +41,8 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/log \ --mount=type=tmpfs,dst=/tmp \ /ctx/build.sh && \ - /ctx/image-info + /ctx/image-info && \ + /ctx/build-initramfs ### LINTING ## Verify final image and contents are correct. -- cgit v1.2.3 From 78bc16acebffcffcb5e544139cb4c5169f652985 Mon Sep 17 00:00:00 2001 From: tranch Date: Mon, 13 Jul 2026 00:17:46 +0800 Subject: Allow env override for image update ref Pass OSTREE_IMAGE_REF from GitHub repository variables into the image build so image-info.json can point systems at the configured update source. --- Containerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 1f09ba1..90bd7c7 100644 --- a/Containerfile +++ b/Containerfile @@ -12,6 +12,7 @@ ARG IMAGE_VENDOR="AeroCore-IO" ARG IMAGE_BRANCH="stable" ARG VERSION_TAG="latest" ARG VERSION_PRETTY="latest" +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 -- cgit v1.2.3 From 5a41b4c5daf60b45105d0dc552c4d46022c92b04 Mon Sep 17 00:00:00 2001 From: tranch Date: Wed, 15 Jul 2026 14:04:06 +0800 Subject: Integrate Instruments release seed Download and verify the selected release during image builds. Bootstrap it once into the first graphical user's XDG directories. --- Containerfile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 90bd7c7..c9377ca 100644 --- a/Containerfile +++ b/Containerfile @@ -36,6 +36,10 @@ ARG OSTREE_IMAGE_REF="" ARG FLATPAK_REMOTE_URL="" ARG HOMEBREW_BOTTLE_DOMAIN="" ARG HOMEBREW_API_DOMAIN="" +ARG INSTRUMENTS_ENABLED="true" +ARG INSTRUMENTS_RELEASE_REPOSITORY="AeroCore-IO/booster-installer" +ARG INSTRUMENTS_VERSION="latest" +ARG INSTRUMENTS_RELEASE_API_BASE="https://api.github.com" RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/cache \ -- cgit v1.2.3 From fc07365cdc27a2e78a57cdf673fa19a99d7cf57f Mon Sep 17 00:00:00 2001 From: tranch Date: Wed, 22 Jul 2026 08:40:43 +0800 Subject: 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. --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') 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 -- cgit v1.2.3 From 80cde14b9c368f58e8f16ad121396ce2f1a50f44 Mon Sep 17 00:00:00 2001 From: tranch Date: Fri, 21 Aug 2026 08:42:38 +0800 Subject: Adapt to Bazzite 44 Update Deck identity matching for the new upstream scripts and add fixture coverage for patch idempotence. Move the live installer base to Fedora 44 while retaining the Fedora 43 Anaconda workaround for explicit legacy builds. --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 16e85a2..be9737e 100644 --- a/Containerfile +++ b/Containerfile @@ -16,7 +16,7 @@ ARG VERSION_PRETTY="latest" 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-deck:stable-44.20260820 ### [IM]MUTABLE /opt ## Some bootable images, like Fedora, have /opt symlinked to /var/opt, in order to -- cgit v1.2.3 From ed4bd0d089d41c5d95fe74937acc2a779c6de6d4 Mon Sep 17 00:00:00 2001 From: tranch Date: Tue, 25 Aug 2026 10:44:18 +0800 Subject: fix(installer): validate ISO payload metadata Rewrite system-release atomically and reject stale or NUL-bearing payload metadata before it reaches Anaconda bootupd. --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index be9737e..71bf132 100644 --- a/Containerfile +++ b/Containerfile @@ -9,7 +9,7 @@ COPY system_files /system_files FROM ${BASE_IMAGE} ARG BASE_IMAGE ARG IMAGE_NAME="aerocore-os" -ARG IMAGE_VENDOR="AeroCore-IO" +ARG IMAGE_VENDOR="aerocore-io" ARG IMAGE_BRANCH="stable" ARG VERSION_TAG="latest" ARG VERSION_PRETTY="latest" -- cgit v1.2.3 From 8774e3cf7db1f8ad37e659017f6b363f54f9d79d Mon Sep 17 00:00:00 2001 From: tranch Date: Thu, 27 Aug 2026 04:37:18 +0800 Subject: fix: authenticate Booster release downloads Mount the CI token as a build secret for release asset requests. --- Containerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 71bf132..9eb1b28 100644 --- a/Containerfile +++ b/Containerfile @@ -44,6 +44,7 @@ ARG INSTRUMENTS_RELEASE_API_BASE="https://api.github.com" RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/cache \ --mount=type=cache,dst=/var/log \ + --mount=type=secret,id=GITHUB_TOKEN \ --mount=type=tmpfs,dst=/tmp \ /ctx/build.sh && \ /ctx/image-info && \ -- cgit v1.2.3 From 61db44fb679bb3d2606cca0dcadac309edff0475 Mon Sep 17 00:00:00 2001 From: tranch Date: Wed, 9 Sep 2026 14:15:56 +0800 Subject: chore: add Bazzite 44 testing candidate flow --- Containerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 9eb1b28..e9cedc9 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" +ARG BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3" FROM scratch AS ctx COPY build_files / @@ -10,12 +10,12 @@ FROM ${BASE_IMAGE} ARG BASE_IMAGE ARG IMAGE_NAME="aerocore-os" ARG IMAGE_VENDOR="aerocore-io" -ARG IMAGE_BRANCH="stable" +ARG IMAGE_BRANCH="testing-candidate" ARG VERSION_TAG="latest" ARG VERSION_PRETTY="latest" ARG OSTREE_IMAGE_REF="" ## Other possible base images include: -# ghcr.io/ublue-os/bazzite-deck:testing +# ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3 # ghcr.io/ublue-os/bazzite-deck:stable-44.20260820 ### [IM]MUTABLE /opt -- cgit v1.2.3 From 573f0d9448ae839ac1b7df5531a35d951af7cd1b Mon Sep 17 00:00:00 2001 From: tranch Date: Thu, 10 Sep 2026 15:01:12 +0800 Subject: test: update base image tag Update the `BASE_IMAGE` argument in the Containerfile to use the latest testing tag. Co-authored-by: llm-git --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index e9cedc9..2f6f195 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:testing-44.20260908.3" +ARG BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:testing-44.20260909.1" FROM scratch AS ctx COPY build_files / -- cgit v1.2.3 From d209ea6aa515d7e356cfb4ae32f612459e36dafe Mon Sep 17 00:00:00 2001 From: tranch Date: Fri, 11 Sep 2026 02:34:45 +0800 Subject: =?UTF-8?q?=E4=BB=A5=20Bazzite=20stable-44.20260908=20=E4=B8=BA=20?= =?UTF-8?q?testing=20=E9=AA=8C=E8=AF=81=E5=9F=BA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Containerfile') diff --git a/Containerfile b/Containerfile index 2f6f195..11d6ebf 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:testing-44.20260909.1" +ARG BASE_IMAGE="ghcr.io/ublue-os/bazzite-deck:stable-44.20260908" FROM scratch AS ctx COPY build_files / @@ -15,8 +15,8 @@ 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.20260908 # ghcr.io/ublue-os/bazzite-deck:testing-44.20260908.3 -# ghcr.io/ublue-os/bazzite-deck:stable-44.20260820 ### [IM]MUTABLE /opt ## Some bootable images, like Fedora, have /opt symlinked to /var/opt, in order to -- cgit v1.2.3