Skip to content

fix: correct Docker manifest creation in builder image workflow #2588

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
Jguer merged 2 commits into from
Mar 9, 2025
Merged

fix: correct Docker manifest creation in builder image workflow #2588

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bfa8f9
fix: correct Docker manifest creation in builder image workflow
Jguer Mar 9, 2025
a644e8f
update golangci and comment out community
Jguer Mar 9, 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
16 changes: 9 additions & 7 deletions .github/workflows/builder-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,25 +115,27 @@ jobs:
ghcr.io/${{ env.REGISTRY_IMAGE }}
tags: |
type=raw,value=latest
type=sha,format=long
type=sha,format=short

- name: Create and push manifest list
env:
DOCKER_CLI_EXPERIMENTAL: enabled
run: |
# Extract tags
TAGS=$(echo '${{ steps.meta.outputs.tags }}' | xargs -I {} echo "-t {}")
# Extract Docker Hub tags
DH_TAGS=$(echo '${{ steps.meta.outputs.tags }}' | grep -v "^ghcr.io" | xargs -I {} echo "-t {}")

# Extract GitHub Container Registry tags
GHCR_TAGS=$(echo '${{ steps.meta.outputs.tags }}' | grep "^ghcr.io" | xargs -I {} echo "-t {}")

Comment on lines +125 to 129
Copy link

Copilot AI Mar 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider wrapping the command substitution in quotes or otherwise ensuring that whitespace in tag values is handled correctly, to prevent potential splitting issues.

Suggested change
DH_TAGS=$(echo '${{ steps.meta.outputs.tags }}' | grep -v "^ghcr.io" | xargs -I {} echo "-t {}")
# Extract GitHub Container Registry tags
GHCR_TAGS=$(echo '${{ steps.meta.outputs.tags }}' | grep "^ghcr.io" | xargs -I {} echo "-t {}")
DH_TAGS="$(echo '${{ steps.meta.outputs.tags }}' | grep -v "^ghcr.io" | xargs -I {} echo "-t {}")"
# Extract GitHub Container Registry tags
GHCR_TAGS="$(echo '${{ steps.meta.outputs.tags }}' | grep "^ghcr.io" | xargs -I {} echo "-t {}")"

Copilot uses AI. Check for mistakes.
# Create a manifest list using the image digests from /tmp/digests/*
DIGESTS=$(for file in /tmp/digests/*; do
echo -n "${{ env.REGISTRY_IMAGE }}@$(cat $file) "
done)

# Create the manifest list with the collected tags and digests
docker buildx imagetools create $TAGS $DIGESTS
# Create the manifest list for Docker Hub
docker buildx imagetools create $DH_TAGS $DIGESTS

# Push to GitHub Container Registry
GHCR_TAGS=$(echo '${{ steps.meta.outputs.tags }}' | sed 's|^|ghcr.io/${{ env.REGISTRY_IMAGE }}:|g' | xargs -I {} echo "-t {}")
# Create the manifest list for GitHub Container Registry
docker buildx imagetools create $GHCR_TAGS $DIGESTS

- name: Inspect image
Expand Down
Loading