Skip to content

Commit 9eaab31

Browse files
committed
Improved docker tagging
1 parent 26debcd commit 9eaab31

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

.github/workflows/dockerhub.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Pull the latest ${{ matrix.platform }} image
22-
run: docker pull --platform ${{ matrix.platform }} leplusorg/maven-check-versions
22+
run: docker pull --platform ${{ matrix.platform }} ${{ github.repository_owner }}/maven-check-versions

.github/workflows/dockerimage.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,27 @@ jobs:
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USERNAME }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
24+
- uses: docker/metadata-action@v5
25+
id: meta
26+
with:
27+
images: ${{ github.repository_owner }}/yaml
28+
tags: |
29+
type=schedule
30+
type=ref,event=branch
31+
type=ref,event=pr
32+
type=semver,pattern={{version}}
33+
type=semver,pattern={{major}}.{{minor}}
34+
type=semver,pattern={{major}}
35+
type=sha
2436
- uses: docker/build-push-action@v5
2537
with:
2638
context: maven-check-versions
2739
platforms: linux/amd64,linux/arm64
2840
pull: true
29-
push: true
41+
push: ${{ github.event_name != 'pull_request' }}
3042
sbom: true
31-
tags: leplusorg/maven-check-versions:latest
43+
tags: ${{ steps.meta.outputs.tags }}
44+
labels: ${{ steps.meta.outputs.labels }}
3245
- name: Test the Docker image
3346
working-directory: maven-check-versions
3447
run: docker compose -f docker-compose.test.yml run sut

0 commit comments

Comments
 (0)