|
30 | 30 | - name: Tag commit |
31 | 31 | id: tag |
32 | 32 | run: | |
33 | | - LAST_TAG=$(git describe --abbrev=0) |
34 | | - VERSION=$(git diff "$LAST_TAG" HEAD "$VERSION_PATH" | sed -nr "s/$VERSION_REGEX/\1/p") |
| 33 | + VERSION=$(git diff ${{ github.event.before }} HEAD "$VERSION_PATH" | sed -nr "s/$VERSION_REGEX/\1/p") |
35 | 34 | [ "$VERSION" ] && git tag -m "v$VERSION" "$VERSION" |
36 | 35 | echo "version=$VERSION" >> "$GITHUB_OUTPUT" |
37 | 36 |
|
@@ -65,16 +64,24 @@ jobs: |
65 | 64 | uses: docker/build-push-action@v6 |
66 | 65 | env: |
67 | 66 | DATABASE_URL: ${{ secrets.DATABASE_URL }} |
| 67 | + dockerhub_repository: ${{ vars.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }} |
| 68 | + version: ${{ needs.tag-commit.outputs.version }} |
68 | 69 | with: |
69 | 70 | secret-envs: database-url=DATABASE_URL |
70 | 71 | push: true |
71 | 72 | provenance: mode=max |
72 | 73 | sbom: true |
73 | 74 | tags: | |
74 | | - ${{ vars.DOCKERHUB_USERNAME }}/arabot:latest |
75 | | - ${{ vars.DOCKERHUB_USERNAME }}/arabot:${{ needs.tag-commit.outputs.version }} |
| 75 | + ${{ env.dockerhub_repository }}:latest |
| 76 | + ${{ env.dockerhub_repository }}:${{ env.version }} |
76 | 77 | ghcr.io/${{ github.repository }}:latest |
77 | | - ghcr.io/${{ github.repository }}:${{ needs.tag-commit.outputs.version }} |
| 78 | + ghcr.io/${{ github.repository }}:${{ env.version }} |
| 79 | + annotations: | |
| 80 | + org.opencontainers.image.title=AraBot |
| 81 | + org.opencontainers.image.authors="${{ github.event.repository.owner.url }}" |
| 82 | + org.opencontainers.image.version="${{ env.version }}" |
| 83 | + org.opencontainers.image.source="${{ github.repositoryUrl }}" |
| 84 | + org.opencontainers.image.url="https://hub.docker.com/repository/docker/${{ env.dockerhub_repository }}/tags/${{ env.version }}" |
78 | 85 | cache-from: type=gha |
79 | 86 | cache-to: type=gha,mode=max |
80 | 87 |
|
|
0 commit comments