Skip to content

Commit 66cc04b

Browse files
AudionutAudionut
committed
docker - fix manifest
1 parent 9fb3430 commit 66cc04b

1 file changed

Lines changed: 22 additions & 2 deletions

File tree

‎.github/workflows/docker-image.yml‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,29 @@ jobs:
151151
# Create and push the manifest to combine both images
152152
- name: Create and push manifest
153153
run: |
154+
# First, inspect the images to verify they are not manifest lists
155+
echo "Inspecting amd64 image..."
156+
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}-amd64
157+
158+
echo "Inspecting arm64 image..."
159+
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}-arm64
160+
161+
echo "Creating manifest list..."
154162
docker manifest create \
155163
${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }} \
156-
--amend ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}-amd64 \
157-
--amend ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}-arm64
164+
${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}-amd64 \
165+
${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}-arm64
166+
167+
echo "Annotating manifest with platform info..."
168+
docker manifest annotate \
169+
${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }} \
170+
${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}-amd64 \
171+
--os linux --arch amd64
172+
173+
docker manifest annotate \
174+
${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }} \
175+
${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}-arm64 \
176+
--os linux --arch arm64
158177
178+
echo "Pushing manifest..."
159179
docker manifest push ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}

0 commit comments

Comments
 (0)