Skip to content

Commit b369417

Browse files
authored
chore: restore latest tag (#2784)
* restore dockerhub publishing * restore latest publishing tag * fix tag/tags inputs
1 parent 1ac6e65 commit b369417

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

.github/workflows/partial-builder.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
tag:
77
required: true
88
type: string
9+
tags:
10+
required: false
11+
type: string
912
secrets:
1013
DOCKERHUB_USERNAME:
1114
required: true
@@ -19,13 +22,19 @@ jobs:
1922
- name: Checkout repository
2023
uses: actions/checkout@v3
2124

22-
- name: Log in to the Container registry
25+
- name: Log in to the Container registry (ghcr.io)
2326
uses: docker/login-action@v2
2427
with:
2528
registry: ghcr.io
2629
username: ${{ github.actor }}
2730
password: ${{ secrets.GITHUB_TOKEN }}
2831

32+
- name: Log in to the Container registry (dockerhub)
33+
uses: docker/login-action@v2
34+
with:
35+
username: ${{ secrets.DOCKERHUB_USERNAME }}
36+
password: ${{ secrets.DOCKERHUB_TOKEN }}
37+
2938
- name: Set up QEMU
3039
uses: docker/setup-qemu-action@v2
3140

@@ -37,13 +46,16 @@ jobs:
3746
echo "__version__ = \"${{ inputs.tag }}\"" > ./mealie/__init__.py
3847
3948
- name: Build and push Docker image
40-
uses: docker/build-push-action@v4
49+
uses: docker/build-push-action@v5
4150
with:
4251
file: ./docker/Dockerfile
4352
context: .
4453
platforms: linux/amd64,linux/arm64
4554
push: true
46-
tags: ghcr.io/${{ github.repository }}:${{ inputs.tag }}
55+
tags: |
56+
hkotel/mealie:${{ inputs.tag }}
57+
ghcr.io/${{ github.repository }}:${{ inputs.tag }}
58+
${{ inputs.tags }}
4759
build-args: |
4860
COMMIT=${{ github.sha }}
4961
# https://docs.docker.com/build/ci/github-actions/cache/#github-cache

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
- frontend-tests
2525
with:
2626
tag: ${{ github.event.release.tag_name }}
27+
tags: |
28+
hkotel/mealie:latest
29+
ghcr.io/${{ github.repository }}:latest
2730
secrets:
2831
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
2932
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

0 commit comments

Comments
 (0)