From 3c15d2fd65728cd35147afe4b824f28a7cb40b71 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Wed, 10 Dec 2025 20:05:20 +0200 Subject: [PATCH 1/2] Build AlmaLinux OS 10 for amd64/v3 platform/variant Handle amd64_v3 rootfs Temporary build on quay.io/almalinuxautobot/almalinux:10 --- .github/workflows/build-test-push.yml | 28 +++++++++++++++---------- Containerfiles/10/Containerfile.base | 2 +- Containerfiles/10/Containerfile.default | 2 +- Containerfiles/10/Containerfile.init | 2 +- Containerfiles/10/Containerfile.micro | 2 +- Containerfiles/10/Containerfile.minimal | 2 +- Containerfiles/10/Containerfile.toolbox | 2 +- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-test-push.yml b/.github/workflows/build-test-push.yml index 792674d..099934b 100644 --- a/.github/workflows/build-test-push.yml +++ b/.github/workflows/build-test-push.yml @@ -444,22 +444,25 @@ jobs: # Run the image and query almalinux-release package's architecture arch=$( docker run --rm rootfs /bin/bash -c "rpm -q --qf=%{ARCH} ${almalinux_release}" ) - # Map found architecture to the corresponding platform - platform= + # Map found architecture to the corresponding platforms + platforms= docker rmi rootfs case ${arch} in i686) - platform=386;; + platforms=386;; x86_64) - platform=amd64;; + platforms=amd64 + [[ ${{ matrix.version_major }} = '10'* ]] && \ + platforms="amd64 amd64_v3" + ;; x86_64_v2) - platform=amd64_v2;; + platforms=amd64_v2;; ppc64le) - platform=ppc64le;; + platforms=ppc64le;; s390x) - platform=s390x;; + platforms=s390x;; aarch64) - platform=arm64;; + platforms=arm64;; *) echo "The '$arch' is incorrect or failed to determine architecture." && false;; esac @@ -468,9 +471,12 @@ jobs: rm -f rootfs.tar.gz # Copy the "taken RootFS" into corresponded .tar.xz - cp -av ${file} ${name}-${platform}.tar.gz - zcat ${name}-${platform}.tar.gz | xz -9 -e -T0 > ${pwd}/${{ matrix.version_major }}/${{ matrix.image_types }}/${platform}/${name}-${platform}.tar.xz - + for platform in $platforms; do + # Skip if the rootfs for specific platform exists. That's for the "amd64 amd64_v3" case + [ -f ${name}-${platform}.tar.gz ] && continue + cp -av ${file} ${name}-${platform}.tar.gz + zcat ${name}-${platform}.tar.gz | xz -9 -e -T0 > ${pwd}/${{ matrix.version_major }}/${{ matrix.image_types }}/${platform}/${name}-${platform}.tar.xz + done fi done diff --git a/Containerfiles/10/Containerfile.base b/Containerfiles/10/Containerfile.base index 4fd5502..5893b50 100644 --- a/Containerfiles/10/Containerfile.base +++ b/Containerfiles/10/Containerfile.base @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10 +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10 FROM ${SYSBASE} AS system-build RUN mkdir -p /mnt/sys-root; \ diff --git a/Containerfiles/10/Containerfile.default b/Containerfiles/10/Containerfile.default index 272d346..1723930 100644 --- a/Containerfiles/10/Containerfile.default +++ b/Containerfiles/10/Containerfile.default @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10 +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10 FROM ${SYSBASE} AS system-build RUN mkdir /mnt/sys-root; \ diff --git a/Containerfiles/10/Containerfile.init b/Containerfiles/10/Containerfile.init index c63fd09..887dbd3 100644 --- a/Containerfiles/10/Containerfile.init +++ b/Containerfiles/10/Containerfile.init @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10 +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10 FROM ${SYSBASE} AS system-build RUN mkdir /mnt/sys-root; \ diff --git a/Containerfiles/10/Containerfile.micro b/Containerfiles/10/Containerfile.micro index 260b86a..b372104 100644 --- a/Containerfiles/10/Containerfile.micro +++ b/Containerfiles/10/Containerfile.micro @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10 +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10 FROM ${SYSBASE} AS system-build RUN mkdir -p /mnt/sys-root; \ diff --git a/Containerfiles/10/Containerfile.minimal b/Containerfiles/10/Containerfile.minimal index 3ab92cc..cdf6619 100644 --- a/Containerfiles/10/Containerfile.minimal +++ b/Containerfiles/10/Containerfile.minimal @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10 +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10 FROM ${SYSBASE} as system-build RUN mkdir /mnt/sys-root; \ diff --git a/Containerfiles/10/Containerfile.toolbox b/Containerfiles/10/Containerfile.toolbox index fb1450d..94c2c9c 100644 --- a/Containerfiles/10/Containerfile.toolbox +++ b/Containerfiles/10/Containerfile.toolbox @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10 +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10 FROM ${SYSBASE} AS system-build RUN mkdir -p /mnt/sys-root; \ From 631f82d09df9ed286c4643168e55928c49d28757 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Fri, 12 Dec 2025 09:29:45 +0200 Subject: [PATCH 2/2] Build AlmaLinux Kitten for amd64/v3 platform/variant Temporary build on quay.io/almalinuxautobot/almalinux:10-kitten --- Containerfiles/10-kitten/Containerfile.base | 2 +- Containerfiles/10-kitten/Containerfile.default | 2 +- Containerfiles/10-kitten/Containerfile.init | 2 +- Containerfiles/10-kitten/Containerfile.micro | 2 +- Containerfiles/10-kitten/Containerfile.minimal | 2 +- Containerfiles/10-kitten/Containerfile.toolbox | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Containerfiles/10-kitten/Containerfile.base b/Containerfiles/10-kitten/Containerfile.base index 0d0c2b6..8b3925a 100644 --- a/Containerfiles/10-kitten/Containerfile.base +++ b/Containerfiles/10-kitten/Containerfile.base @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten FROM ${SYSBASE} AS system-build RUN mkdir -p /mnt/sys-root; \ diff --git a/Containerfiles/10-kitten/Containerfile.default b/Containerfiles/10-kitten/Containerfile.default index b428992..843df83 100644 --- a/Containerfiles/10-kitten/Containerfile.default +++ b/Containerfiles/10-kitten/Containerfile.default @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten FROM ${SYSBASE} AS system-build RUN mkdir /mnt/sys-root; \ diff --git a/Containerfiles/10-kitten/Containerfile.init b/Containerfiles/10-kitten/Containerfile.init index 44f0562..6f3c910 100644 --- a/Containerfiles/10-kitten/Containerfile.init +++ b/Containerfiles/10-kitten/Containerfile.init @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten FROM ${SYSBASE} AS system-build RUN mkdir /mnt/sys-root; \ diff --git a/Containerfiles/10-kitten/Containerfile.micro b/Containerfiles/10-kitten/Containerfile.micro index 146f16f..f22012b 100644 --- a/Containerfiles/10-kitten/Containerfile.micro +++ b/Containerfiles/10-kitten/Containerfile.micro @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten FROM ${SYSBASE} AS system-build RUN mkdir -p /mnt/sys-root; \ diff --git a/Containerfiles/10-kitten/Containerfile.minimal b/Containerfiles/10-kitten/Containerfile.minimal index 9647823..7642824 100644 --- a/Containerfiles/10-kitten/Containerfile.minimal +++ b/Containerfiles/10-kitten/Containerfile.minimal @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten FROM ${SYSBASE} as system-build RUN mkdir /mnt/sys-root; \ diff --git a/Containerfiles/10-kitten/Containerfile.toolbox b/Containerfiles/10-kitten/Containerfile.toolbox index f01e965..44ff348 100644 --- a/Containerfiles/10-kitten/Containerfile.toolbox +++ b/Containerfiles/10-kitten/Containerfile.toolbox @@ -1,4 +1,4 @@ -ARG SYSBASE=quay.io/almalinuxorg/almalinux:10-kitten +ARG SYSBASE=quay.io/almalinuxautobot/almalinux:10-kitten FROM ${SYSBASE} AS system-build RUN mkdir -p /mnt/sys-root; \