chore: restore latest tag (mealie-recipes#2784)

* restore dockerhub publishing * restore latest publishing tag * fix tag/tags inputs
michael-genson · Dec 4, 2023 · b369417 · b369417
1 parent 1ac6e65
commit b369417
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/partial-builder.yml b/.github/workflows/partial-builder.yml
@@ -6,6 +6,9 @@ on:
       tag:
         required: true
         type: string
+      tags:
+        required: false
+        type: string
     secrets:
       DOCKERHUB_USERNAME:
         required: true
@@ -19,13 +22,19 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Log in to the Container registry
+      - name: Log in to the Container registry (ghcr.io)
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Log in to the Container registry (dockerhub)
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -37,13 +46,16 @@ jobs:
           echo "__version__ = \"${{ inputs.tag }}\"" > ./mealie/__init__.py
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           file: ./docker/Dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/${{ github.repository }}:${{ inputs.tag }}
+          tags: |
+            hkotel/mealie:${{ inputs.tag }}
+            ghcr.io/${{ github.repository }}:${{ inputs.tag }}
+            ${{ inputs.tags }}
           build-args: |
             COMMIT=${{ github.sha }}
           # https://docs.docker.com/build/ci/github-actions/cache/#github-cache

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,6 +24,9 @@ jobs:
       - frontend-tests
     with:
       tag: ${{ github.event.release.tag_name }}
+      tags: |
+          hkotel/mealie:latest
+          ghcr.io/${{ github.repository }}:latest
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}