Skip to content

feat: build both amd64 (= amd64/v2) and amd64/v3 images #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 28, 2025
Merged

feat: build both amd64 (= amd64/v2) and amd64/v3 images #38

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d46948
feat: build both amd64/v2 and amd64/v3 images
wdconinc Nov 16, 2025
985af1c
Use underscore for amd_v2/3, and merge all in base-manifest
wdconinc Nov 16, 2025
08507d7
Update registry image tag to use AMD64_V2 digest for name
wdconinc Nov 17, 2025
77f3a4b
Build eic for amd64_v3 too
wdconinc Nov 25, 2025
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
24 changes: 20 additions & 4 deletions .github/workflows/build-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,14 @@ jobs:
include:
- BASE_IMAGE: debian:stable-slim
BUILD_IMAGE: debian_stable_base
PLATFORM: linux/amd64
PLATFORM: linux/amd64
runner: ubuntu-latest
arch: amd64
- BASE_IMAGE: debian:stable-slim
BUILD_IMAGE: debian_stable_base
PLATFORM: linux/amd64/v3
runner: ubuntu-latest
arch: amd64_v3
- BASE_IMAGE: debian:stable-slim
BUILD_IMAGE: debian_stable_base
PLATFORM: linux/arm64
Expand Down Expand Up @@ -109,7 +114,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/amd64/v3,linux/arm64
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
id: buildx
Expand Down Expand Up @@ -229,6 +234,7 @@ jobs:
run: |
# Read the digests from the files
DIGEST_AMD64=$(cat /tmp/digests/amd64.digest)
DIGEST_AMD64_V3=$(cat /tmp/digests/amd64_v3.digest)
DIGEST_ARM64=$(cat /tmp/digests/arm64.digest)
# Get the base image name from the digests (they'll be the same)
REGISTRY_IMAGE_TAG=$(echo $DIGEST_AMD64 | cut -d'@' -f1)
Expand All @@ -240,11 +246,13 @@ jobs:
echo "Image Name: $IMAGE"
echo "Tag Name: $TAG"
echo "AMD64 Digest: $DIGEST_AMD64"
echo "AMD64_V3 Digest: $DIGEST_AMD64_V3"
echo "ARM64 Digest: $DIGEST_ARM64"
echo "registry=$REGISTRY" >> $GITHUB_OUTPUT
echo "image=$IMAGE" >> $GITHUB_OUTPUT
echo "tag=$TAG" >> $GITHUB_OUTPUT
echo "amd64=$DIGEST_AMD64" >> $GITHUB_OUTPUT
echo "amd64_v3=$DIGEST_AMD64_V3" >> $GITHUB_OUTPUT
echo "arm64=$DIGEST_ARM64" >> $GITHUB_OUTPUT
- name: Extract Docker metadata for final tags
id: meta
Expand All @@ -268,6 +276,7 @@ jobs:
docker buildx imagetools create \
$TAG_ARGS \
${{ steps.digests.outputs.amd64 }} \
${{ steps.digests.outputs.amd64_v3 }} \
${{ steps.digests.outputs.arm64 }}

eic:
Expand All @@ -281,11 +290,14 @@ jobs:
BUILDER_IMAGE: [debian_stable_base]
RUNTIME_IMAGE: [debian_stable_base]
ENV: [ci, xl]
arch: [amd64, arm64]
arch: [amd64, amd64_v3, arm64]
include:
- arch: amd64
runner: ubuntu-latest
PLATFORM: linux/amd64
- arch: amd64_v3
runner: ubuntu-latest
PLATFORM: linux/amd64/v3
- arch: arm64
runner: ubuntu-24.04-arm
PLATFORM: linux/arm64
Expand Down Expand Up @@ -325,7 +337,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/amd64/v3,linux/arm64
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
id: buildx
Expand Down Expand Up @@ -462,6 +474,7 @@ jobs:
run: |
# Read the digests from the files
DIGEST_AMD64=$(cat /tmp/digests/amd64.digest)
DIGEST_AMD64_V3=$(cat /tmp/digests/amd64_v3.digest)
DIGEST_ARM64=$(cat /tmp/digests/arm64.digest)
# Get the base image name from the digests (they'll be the same)
REGISTRY_IMAGE_TAG=$(echo $DIGEST_AMD64 | cut -d'@' -f1)
Expand All @@ -473,11 +486,13 @@ jobs:
echo "Image Name: $IMAGE"
echo "Tag Name: $TAG"
echo "AMD64 Digest: $DIGEST_AMD64"
echo "AMD64_V3 Digest: $DIGEST_AMD64_V3"
echo "ARM64 Digest: $DIGEST_ARM64"
echo "registry=$REGISTRY" >> $GITHUB_OUTPUT
echo "image=$IMAGE" >> $GITHUB_OUTPUT
echo "tag=$TAG" >> $GITHUB_OUTPUT
echo "amd64=$DIGEST_AMD64" >> $GITHUB_OUTPUT
echo "amd64_v3=$DIGEST_AMD64_V3" >> $GITHUB_OUTPUT
echo "arm64=$DIGEST_ARM64" >> $GITHUB_OUTPUT
- name: Extract Docker metadata for final tags
id: meta
Expand All @@ -501,4 +516,5 @@ jobs:
docker buildx imagetools create \
$TAG_ARGS \
${{ steps.digests.outputs.amd64 }} \
${{ steps.digests.outputs.amd64_v3 }} \
${{ steps.digests.outputs.arm64 }}
Loading