From 385357ca0609d92f51821f8af276102bef154606 Mon Sep 17 00:00:00 2001
From: Maaike <mlimper@wmo.int>
Date: Mon, 13 Jan 2025 09:43:46 +0100
Subject: [PATCH] Update and rename ghcr.yml to build_and_publish_image.yml

---
 .../{ghcr.yml => build_and_publish_image.yml} | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)
 rename .github/workflows/{ghcr.yml => build_and_publish_image.yml} (69%)

diff --git a/.github/workflows/ghcr.yml b/.github/workflows/build_and_publish_image.yml
similarity index 69%
rename from .github/workflows/ghcr.yml
rename to .github/workflows/build_and_publish_image.yml
index b1f7324..4053c50 100644
--- a/.github/workflows/ghcr.yml
+++ b/.github/workflows/build_and_publish_image.yml
@@ -3,7 +3,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: publish image to ghcr.io
+name: publish images to ghrc.io and docker-hub
 
 on:
   push:
@@ -13,32 +13,39 @@ on:
     types: [published]
 
 env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+  DOCKER_ORG: wmoim
 
 jobs:
-  # Push image to GitHub Packages.
-  # See also https://docs.docker.com/docker-hub/builds/
   push:
     runs-on: ubuntu-latest
     permissions:
       packages: write
       contents: read
+    strategy:
+      matrix:
+        image:
+          - wis2box-api
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
@@ -48,10 +55,11 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+            ${{ env.DOCKER_ORG }}/${{ matrix.image }}
+            ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
-            type=semver,pattern={{version}}
+            type=pep440,pattern={{version}}
 
       - name: Build and push
         uses: docker/build-push-action@v2.7.0