mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 17:30:23 +08:00
fix(ci): 修复多架构Docker镜像构建,arm64覆盖amd64问题
分开push到同一tag会导致后者覆盖前者manifest。 改为先按digest分别push,再用imagetools合并为多架构manifest。
This commit is contained in:
33
.github/workflows/docker-publish.yml
vendored
33
.github/workflows/docker-publish.yml
vendored
@@ -270,12 +270,11 @@ jobs:
|
|||||||
echo "Hub release tag: ${{ needs.download-hub.outputs.hub_tag }}"
|
echo "Hub release tag: ${{ needs.download-hub.outputs.hub_tag }}"
|
||||||
|
|
||||||
- name: Build and push app image (amd64)
|
- name: Build and push app image (amd64)
|
||||||
|
id: build-amd64
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./Dockerfile.app
|
file: ./Dockerfile.app
|
||||||
push: true
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
no-cache-filters: builder
|
no-cache-filters: builder
|
||||||
cache-from: type=gha,scope=app-amd64
|
cache-from: type=gha,scope=app-amd64
|
||||||
@@ -284,14 +283,14 @@ jobs:
|
|||||||
HUB_RELEASE_REPO=${{ env.GITHUB_REPO }}
|
HUB_RELEASE_REPO=${{ env.GITHUB_REPO }}
|
||||||
HUB_TAG=${{ needs.download-hub.outputs.hub_tag }}
|
HUB_TAG=${{ needs.download-hub.outputs.hub_tag }}
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64
|
||||||
|
outputs: type=image,"name=${{ env.REGISTRY }}/${{ env.APP_IMAGE_NAME }},docker.io/fawney19/aether",push-by-digest=true,name-canonical=true,push=true
|
||||||
|
|
||||||
- name: Build and push app image (arm64)
|
- name: Build and push app image (arm64)
|
||||||
|
id: build-arm64
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./Dockerfile.app
|
file: ./Dockerfile.app
|
||||||
push: true
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
no-cache-filters: builder
|
no-cache-filters: builder
|
||||||
cache-from: type=gha,scope=app-arm64
|
cache-from: type=gha,scope=app-arm64
|
||||||
@@ -300,3 +299,29 @@ jobs:
|
|||||||
HUB_RELEASE_REPO=${{ env.GITHUB_REPO }}
|
HUB_RELEASE_REPO=${{ env.GITHUB_REPO }}
|
||||||
HUB_TAG=${{ needs.download-hub.outputs.hub_tag }}
|
HUB_TAG=${{ needs.download-hub.outputs.hub_tag }}
|
||||||
platforms: linux/arm64
|
platforms: linux/arm64
|
||||||
|
outputs: type=image,"name=${{ env.REGISTRY }}/${{ env.APP_IMAGE_NAME }},docker.io/fawney19/aether",push-by-digest=true,name-canonical=true,push=true
|
||||||
|
|
||||||
|
- name: Create multi-arch manifest and push
|
||||||
|
run: |
|
||||||
|
# Extract digests
|
||||||
|
AMD64_DIGEST="${{ steps.build-amd64.outputs.digest }}"
|
||||||
|
ARM64_DIGEST="${{ steps.build-arm64.outputs.digest }}"
|
||||||
|
echo "amd64 digest: $AMD64_DIGEST"
|
||||||
|
echo "arm64 digest: $ARM64_DIGEST"
|
||||||
|
|
||||||
|
# For each tag, create multi-arch manifest on each registry
|
||||||
|
TAGS=$(echo "${{ steps.meta.outputs.tags }}" | tr '\n' ' ')
|
||||||
|
for FULL_TAG in $TAGS; do
|
||||||
|
# Determine which registry this tag belongs to
|
||||||
|
if [[ "$FULL_TAG" == ghcr.io/* ]]; then
|
||||||
|
REPO="${{ env.REGISTRY }}/${{ env.APP_IMAGE_NAME }}"
|
||||||
|
elif [[ "$FULL_TAG" == docker.io/* ]]; then
|
||||||
|
REPO="docker.io/fawney19/aether"
|
||||||
|
else
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
echo "Creating manifest for $FULL_TAG"
|
||||||
|
docker buildx imagetools create -t "$FULL_TAG" \
|
||||||
|
"$REPO@$AMD64_DIGEST" \
|
||||||
|
"$REPO@$ARM64_DIGEST"
|
||||||
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user