Skip to content

Commit 9100316

Browse files
authored
Merge pull request #7 from nullable-eth/fix-ghcr-tags-match-release
fix: the ghcr tags to match the github releases created
2 parents d5fab3d + 2bd684b commit 9100316

File tree

1 file changed

+4
-44
lines changed

1 file changed

+4
-44
lines changed

.github/workflows/docker-publish.yml

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -38,55 +38,17 @@ jobs:
3838
username: ${{ github.actor }}
3939
password: ${{ secrets.GITHUB_TOKEN }}
4040

41-
- name: Generate version and tags
42-
id: meta
43-
run: |
44-
# Convert repository name to lowercase
45-
IMAGE_NAME_LOWER=$(echo "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
46-
47-
# Get current date for version generation
48-
DATE=$(date +'%Y%m%d')
49-
50-
# Generate version based on context
51-
if [[ $GITHUB_REF == refs/tags/v* ]]; then
52-
# If this is a tag push, use the tag as version
53-
VERSION=${GITHUB_REF#refs/tags/v}
54-
TAGS="${IMAGE_NAME_LOWER}:${VERSION},${IMAGE_NAME_LOWER}:latest"
55-
elif [[ $GITHUB_REF == refs/heads/main ]]; then
56-
# If this is main branch, generate auto-incrementing version
57-
# Get count of commits to main for auto-incrementing
58-
COMMIT_COUNT=$(git rev-list --count HEAD)
59-
SHORT_SHA=${GITHUB_SHA::8}
60-
61-
# Generate semantic version: 1.0.COMMIT_COUNT-DATE
62-
VERSION="1.0.${COMMIT_COUNT}"
63-
TAGS="${IMAGE_NAME_LOWER}:${VERSION},${IMAGE_NAME_LOWER}:latest,${IMAGE_NAME_LOWER}:${DATE}-${SHORT_SHA}"
64-
else
65-
# For pull requests or other branches
66-
SHORT_SHA=${GITHUB_SHA::8}
67-
VERSION="pr-${SHORT_SHA}"
68-
TAGS="${IMAGE_NAME_LOWER}:${VERSION}"
69-
fi
70-
71-
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
72-
echo "TAGS=${TAGS}" >> $GITHUB_OUTPUT
73-
echo "IMAGE_NAME_LOWER=${IMAGE_NAME_LOWER}" >> $GITHUB_OUTPUT
74-
75-
# Print for debugging
76-
echo "Generated version: ${VERSION}"
77-
echo "Generated tags: ${TAGS}"
78-
7941
- name: Extract metadata
8042
id: docker_meta
8143
uses: docker/metadata-action@v5
8244
with:
83-
images: ${{ steps.meta.outputs.IMAGE_NAME_LOWER }}
45+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
8446
tags: |
8547
type=ref,event=branch
8648
type=ref,event=pr
8749
type=semver,pattern={{version}}
8850
type=semver,pattern={{major}}.{{minor}}
89-
type=raw,value=${{ steps.meta.outputs.VERSION }}
51+
type=semver,pattern={{major}}
9052
type=raw,value=latest,enable={{is_default_branch}}
9153
9254
- name: Build and push Docker image
@@ -106,16 +68,14 @@ jobs:
10668
run: |
10769
echo "## 🐳 Docker Image Published" >> $GITHUB_STEP_SUMMARY
10870
echo "" >> $GITHUB_STEP_SUMMARY
109-
echo "**Version:** ${{ steps.meta.outputs.VERSION }}" >> $GITHUB_STEP_SUMMARY
110-
echo "" >> $GITHUB_STEP_SUMMARY
11171
echo "**Registry:** ${{ env.REGISTRY }}" >> $GITHUB_STEP_SUMMARY
11272
echo "" >> $GITHUB_STEP_SUMMARY
11373
echo "**Tags:**" >> $GITHUB_STEP_SUMMARY
11474
echo '```' >> $GITHUB_STEP_SUMMARY
11575
echo "${{ steps.docker_meta.outputs.tags }}" | tr ',' '\n' >> $GITHUB_STEP_SUMMARY
11676
echo '```' >> $GITHUB_STEP_SUMMARY
11777
echo "" >> $GITHUB_STEP_SUMMARY
118-
echo "**Pull command:**" >> $GITHUB_STEP_SUMMARY
78+
echo "**Pull command (latest):**" >> $GITHUB_STEP_SUMMARY
11979
echo '```bash' >> $GITHUB_STEP_SUMMARY
120-
echo "docker pull ${{ steps.meta.outputs.IMAGE_NAME_LOWER }}:${{ steps.meta.outputs.VERSION }}" >> $GITHUB_STEP_SUMMARY
80+
echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" >> $GITHUB_STEP_SUMMARY
12181
echo '```' >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)