Skip to content

Commit d6c0339

Browse files
committed
Try to fix tagging in workflows
1 parent fb3e65c commit d6c0339

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

.github/workflows/build-latest-release.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
steps:
3131
- name: Checkout
3232
uses: actions/checkout@v3
33+
env:
34+
RELEASE_TAG: ${{ needs.get-release-tag.outputs.release-tag }}
3335
with:
3436
ref: ${{ env.RELEASE_TAG }}
3537

@@ -50,14 +52,16 @@ jobs:
5052
context: .
5153
file: ./Dockerfile
5254
push: true
53-
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${RELEASE_TAG}-amd64, ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest-amd64, ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.run_id }}-amd64
55+
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.RELEASE_TAG }}-amd64, ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest-amd64, ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.run_id }}-amd64
5456

5557
build-arm64:
5658
runs-on: ubuntu-24.04-arm
5759
needs: get-release-tag
5860
steps:
5961
- name: Checkout
6062
uses: actions/checkout@v3
63+
env:
64+
RELEASE_TAG: ${{ needs.get-release-tag.outputs.release-tag }}
6165
with:
6266
ref: ${{ env.RELEASE_TAG }}
6367

@@ -78,7 +82,7 @@ jobs:
7882
context: .
7983
file: ./Dockerfile
8084
push: true
81-
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${RELEASE_TAG}-arm64, ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest-arm64, ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.run_id }}-arm64
85+
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.RELEASE_TAG }}-arm64, ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest-arm64, ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.run_id }}-arm64
8286

8387
create-manifests:
8488
runs-on: ubuntu-24.04
@@ -96,14 +100,14 @@ jobs:
96100
- name: Set up QEMU
97101
uses: docker/setup-qemu-action@v3
98102

99-
- name: Create manifest for tag ${{ env.RELEASE_TAG }} and push
103+
- name: Create manifest for release tag and push
100104
env:
101105
RELEASE_TAG: ${{ needs.get-release-tag.outputs.release-tag }}
102106
run: |
103107
docker buildx imagetools create \
104-
-t ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${RELEASE_TAG } \
105-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${RELEASE_TAG}-amd64 \
106-
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${RELEASE_TAG}-arm64
108+
-t ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.RELEASE_TAG }} \
109+
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.RELEASE_TAG }}-amd64 \
110+
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.RELEASE_TAG }}-arm64
107111
108112
- name: Create latest manifest and push
109113
run: |

.github/workflows/build-sb-latest-release.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
context: .
4444
file: ./Dockerfile
4545
push: true
46-
tags: ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${SB_TAG}-amd64, ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-latest-amd64, ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ github.run_id }}-amd64
46+
tags: ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ env.SB_TAG }}-amd64, ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-latest-amd64, ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ github.run_id }}-amd64
4747
build-args: |
48-
CHECKOUT=${SB_TAG}
48+
CHECKOUT=${{ env.SB_TAG }}
4949
5050
build-arm64:
5151
runs-on: ubuntu-24.04-arm
@@ -71,9 +71,9 @@ jobs:
7171
context: .
7272
file: ./Dockerfile
7373
push: true
74-
tags: ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${SB_TAG}-arm64, ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-latest-arm64, ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ github.run_id }}-arm64
74+
tags: ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ env.SB_TAG }}-arm64, ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-latest-arm64, ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ github.run_id }}-arm64
7575
build-args: |
76-
CHECKOUT=${SB_TAG}
76+
CHECKOUT=${{ env.SB_TAG }}
7777
7878
create-manifests:
7979
runs-on: ubuntu-latest
@@ -96,9 +96,9 @@ jobs:
9696
SB_TAG: ${{ needs.get-sb-tag.outputs.sb-tag }}
9797
run: |
9898
docker buildx imagetools create \
99-
-t ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${SB_TAG} \
100-
${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${SB_TAG}-amd64 \
101-
${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${SB_TAG}-arm64
99+
-t ${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ env.SB_TAG }} \
100+
${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ env.SB_TAG }}-amd64 \
101+
${{ secrets.DOCKERHUB_USERNAME }}/sourcebans:sb-${{ env.SB_TAG }}-arm64
102102
103103
- name: Create latest manifest and push
104104
run: |

0 commit comments

Comments
 (0)