From 4d89afe7290d95f58366579c0710fd80f30a5ff3 Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Sun, 24 Aug 2025 18:35:35 -0300 Subject: [PATCH] chore: clean up the repo even more Signed-off-by: Tulip Blossom --- Containerfile | 8 ++++---- Justfile | 14 ++++++++++---- build-scripts/build.sh => build.sh | 7 ++++++- config.toml | 2 +- files/usr/lib/systemd/zram-generator.conf | 2 -- 5 files changed, 21 insertions(+), 12 deletions(-) rename build-scripts/build.sh => build.sh (92%) delete mode 100644 files/usr/lib/systemd/zram-generator.conf diff --git a/Containerfile b/Containerfile index 1c4830b..55bc7ad 100644 --- a/Containerfile +++ b/Containerfile @@ -1,7 +1,6 @@ FROM scratch AS ctx -COPY files /files -COPY build-scripts /build-scripts +COPY build.sh /build.sh FROM quay.io/centos-bootc/centos-bootc:c10s @@ -9,6 +8,7 @@ RUN --mount=type=tmpfs,dst=/var \ --mount=type=tmpfs,dst=/tmp \ --mount=type=tmpfs,dst=/boot \ --mount=type=tmpfs,dst=/run \ - --mount=type=bind,from=ctx,source=/build-scripts,dst=/tmp/build-scripts \ - --mount=type=bind,from=ctx,source=/files,dst=/tmp/files \ + --mount=type=bind,from=ctx,source=/,dst=/tmp/build-scripts \ /tmp/build-scripts/build.sh + +RUN bootc container lint --fatal-warnings diff --git a/Justfile b/Justfile index 225c55e..5b7bb75 100644 --- a/Justfile +++ b/Justfile @@ -1,16 +1,22 @@ -iso: +image := env("IMAGE_FULL", "ghcr.io/tulilirockz/taxifolia:latest") + +iso $image=image: + #!/usr/bin/env bash mkdir -p output - sudo podman pull ghcr.io/tulilirockz/fiskar:latest + IMAGE_CONFIG="$(mktemp)" + export IMAGE_FULL="${image}" + envsubst < ./config.toml > "${IMAGE_CONFIG}" + sudo podman pull "${image}" sudo podman run \ --rm \ -it \ --privileged \ --pull=newer \ --security-opt label=type:unconfined_t \ - -v ./config.toml:/config.toml:ro \ + -v "${IMAGE_CONFIG}:/config.toml:ro" \ -v ./output:/output \ -v /var/lib/containers/storage:/var/lib/containers/storage \ quay.io/centos-bootc/bootc-image-builder:latest \ --type iso \ --use-librepo=True \ - ghcr.io/tulilirockz/fiskar:latest + "${image}" diff --git a/build-scripts/build.sh b/build.sh similarity index 92% rename from build-scripts/build.sh rename to build.sh index 7335a5d..73cf357 100755 --- a/build-scripts/build.sh +++ b/build.sh @@ -3,6 +3,8 @@ set -xeuo pipefail systemctl enable sshd +systemctl enable podman-auto-update.timer +systemctl enable --global podman-auto-update.timer dnf -y remove \ adcli \ @@ -51,7 +53,10 @@ dnf -y install epel-release dnf config-manager --set-disabled epel dnf -y install --enablerepo="epel" just -install -Dpm0644 -t /usr/lib/systemd /tmp/files/usr/lib/systemd/zram-generator.conf +tee /usr/lib/systemd/zram-generator.conf <