aljaz/cdk
1
0
Fork 0
mirror of https://github.com/aljazceru/cdk.git synced 2025-12-30 19:15:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #825 from asmogo/arm_fix

Browse Source 
fix arm override
This commit is contained in:
asmo
2025-06-19 16:02:17 +02:00
committed by GitHub
parent ea250a4c3d
commit bcd319b9cf
2 changed files with 8 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
.github/workflows/docker-publish-arm.yml vendored
View File

@@ -40,13 +40,13 @@ jobs:
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=latest,enable=${{ github.event_name == 'release' }}
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=ref,event=branch
type=ref,event=pr
type=sha
${{ github.event.inputs.tag != '' && github.event.inputs.tag || '' }}
type=raw,value=latest-arm64,enable=${{ github.event_name == 'release' }}
type=semver,pattern={{version}}-arm64
type=semver,pattern={{major}}.{{minor}}-arm64
type=ref,event=branch,suffix=-arm64
type=ref,event=pr,suffix=-arm64
type=sha,suffix=-arm64
${{ github.event.inputs.tag != '' && format('{0}-arm64', github.event.inputs.tag) || '' }}
# Build and push ARM64 image with architecture suffix
- name: Build and push Docker image
@@ -59,27 +59,4 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}-arm64
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
# Create and push multi-arch manifest if both images exist
- name: Create and push multi-arch manifest
run: |
# For each tag in the metadata output
echo "${{ steps.meta.outputs.tags }}" | while read -r tag; do
# Check if AMD64 image exists
if docker manifest inspect $tag-amd64 >/dev/null 2>&1; then
# Create manifest
docker manifest create $tag \
$tag-amd64 \
$tag-arm64
# Annotate the manifest with architecture specific information
docker manifest annotate $tag $tag-amd64 --arch amd64
docker manifest annotate $tag $tag-arm64 --arch arm64
# Push the manifest
docker manifest push $tag
else
echo "AMD64 image not found for $tag, skipping manifest creation"
fi
done
cache-to: type=gha,mode=max

23
.github/workflows/docker-publish.yml vendored
View File

@@ -59,26 +59,3 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
# Create and push multi-arch manifest if both images exist
- name: Create and push multi-arch manifest
run: |
# For each tag in the metadata output
echo "${{ steps.meta.outputs.tags }}" | while read -r tag; do
# Check if ARM64 image exists
if docker manifest inspect $tag-arm64 >/dev/null 2>&1; then
# Create manifest
docker manifest create $tag \
$tag-amd64 \
$tag-arm64
# Annotate the manifest with architecture specific information
docker manifest annotate $tag $tag-amd64 --arch amd64
docker manifest annotate $tag $tag-arm64 --arch arm64
# Push the manifest
docker manifest push $tag
else
echo "ARM64 image not found for $tag, skipping manifest creation"
fi
done