diff --git a/Containerfile b/Containerfile index 847255db..00019fae 100644 --- a/Containerfile +++ b/Containerfile @@ -2,6 +2,10 @@ ARG BASE_IMAGE_NAME="kinoite" ARG FEDORA_MAJOR_VERSION="41" ARG SOURCE_IMAGE="${BASE_IMAGE_NAME}-main" ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" +ARG COMMON_IMAGE="ghcr.io/get-aurora-dev/common:latest" +ARG COMMON_IMAGE_SHA="" + +FROM ${COMMON_IMAGE}@${COMMON_IMAGE_SHA} AS common FROM scratch AS ctx COPY /system_files /system_files diff --git a/Justfile b/Justfile index 6ce3dde2..5c404ef2 100644 --- a/Justfile +++ b/Justfile @@ -1,6 +1,7 @@ repo_organization := "ublue-os" rechunker_image := "ghcr.io/hhd-dev/rechunk:v1.2.4@sha256:8a84bd5a029681aa8db523f927b7c53b5aded9b078b81605ac0a2fedc969f528" iso_builder_image := "ghcr.io/jasonn3/build-container-installer:v1.4.0@sha256:a6b52ef0b410a625d7abd16f0467d257ef8db1ec94f672a89d5b95cb25487de1" +common_image := "ghcr.io/get-aurora-dev/common:latest" images := '( [aurora]=aurora [aurora-dx]=aurora-dx @@ -104,6 +105,8 @@ build $image="aurora" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipeline # Image Name image_name=$({{ just }} image_name {{ image }} {{ tag }} {{ flavor }}) + common_image_sha=$(yq -r '.images[] | select(.name == "common") | .digest' image-versions.yml) + # Base Image base_image_name="kinoite" @@ -141,6 +144,8 @@ build $image="aurora" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipeline {{ just }} verify-container "akmods-nvidia-open:${akmods_flavor}-${fedora_version}-${kernel_release}" fi + {{ just }} verify-container "common:latest@${common_image_sha}" ghcr.io/get-aurora-dev https://raw.githubusercontent.com/get-aurora-dev/common/refs/heads/main/cosign.pub + # Get Version if [[ "${tag}" =~ stable ]]; then ver="${fedora_version}.$(date +%Y%m%d)" @@ -168,6 +173,8 @@ build $image="aurora" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipeline fi BUILD_ARGS+=("--build-arg" "AKMODS_FLAVOR=${akmods_flavor}") BUILD_ARGS+=("--build-arg" "BASE_IMAGE_NAME=${base_image_name}") + BUILD_ARGS+=("--build-arg" "COMMON_IMAGE={{ common_image }}") + BUILD_ARGS+=("--build-arg" "COMMON_IMAGE_SHA=${common_image_sha}") BUILD_ARGS+=("--build-arg" "FEDORA_MAJOR_VERSION=${fedora_version}") BUILD_ARGS+=("--build-arg" "IMAGE_NAME=${image_name}") BUILD_ARGS+=("--build-arg" "IMAGE_VENDOR={{ repo_organization }}") diff --git a/image-versions.yml b/image-versions.yml index b7d09ca5..732a3fa4 100644 --- a/image-versions.yml +++ b/image-versions.yml @@ -3,3 +3,8 @@ images: image: ghcr.io/ublue-os/kinoite-main tag: latest digest: sha256:8d22e2a54f33e57fabf47b6987c8c2811b39b12b0d5bfe9b32e89a05dad8e638 + - name: common + image: ghcr.io/get-aurora-dev/common + tag: latest + digest: sha256:72dbe6fad063b4b58ee05e28da0d9e6e29edf03a0d77322330829a2ef1eda663 +