diff --git a/Containerfile b/Containerfile index 92dc2d13..ea91e2a3 100644 --- a/Containerfile +++ b/Containerfile @@ -6,16 +6,20 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS nokmods ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" +ARG IMAGE_VENDOR="ublue-os" +ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" COPY github-release-install.sh /tmp/github-release-install.sh +COPY image-info.sh /tmp/image-info.sh COPY nokmods-install.sh /tmp/nokmods-install.sh COPY nokmods-post-install.sh /tmp/nokmods-post-install.sh COPY nokmods-packages.json /tmp/nokmods-packages.json COPY --from=ghcr.io/ublue-os/config:latest /rpms /tmp/rpms -RUN /tmp/nokmods-install.sh && \ +RUN /tmp/image-info.sh && \ + /tmp/nokmods-install.sh && \ /tmp/nokmods-post-install.sh && \ # temporary fix for https://github.com/containers/podman/issues/19930 rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-8d641964bc && \ @@ -27,6 +31,8 @@ RUN ostree container commit && \ FROM nokmods AS main ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" +ARG IMAGE_VENDOR="ublue-os" +ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" COPY main-install.sh /tmp/main-install.sh @@ -35,7 +41,8 @@ COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rp COPY main-sys_files / -RUN /tmp/main-install.sh && \ +RUN /tmp/image-info.sh && \ + /tmp/main-install.sh && \ rm -rf /tmp/* /var/* RUN ostree container commit && \ diff --git a/image-info.sh b/image-info.sh new file mode 100755 index 00000000..b7682b64 --- /dev/null +++ b/image-info.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +set -oue pipefail + +IMAGE_INFO="/usr/share/ublue-os/image-info.json" +IMAGE_REF="docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME" + +case $FEDORA_MAJOR_VERSION in + 38) + IMAGE_TAG="latest" + ;; + *) + IMAGE_TAG="$FEDORA_MAJOR_VERSION" + ;; +esac + +touch $IMAGE_INFO +cat > $IMAGE_INFO <