Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions .github/workflows/build-test-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10-kitten/Containerfile.base
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10-kitten/Containerfile.default
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10-kitten/Containerfile.init
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10-kitten/Containerfile.micro
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10-kitten/Containerfile.minimal
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10-kitten/Containerfile.toolbox
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10/Containerfile.base
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10/Containerfile.default
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10/Containerfile.init
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10/Containerfile.micro
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10/Containerfile.minimal
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Containerfiles/10/Containerfile.toolbox
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down