From 37c639f6e8c16fa21fbf9d1fc1b60409ae580490 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sat, 29 Jun 2024 11:16:32 +0200
Subject: [PATCH] Publish test images under another tag to work around strange
 behavior of Compose's pull policy. (#901)

---
 .github/workflows/docker-images.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index af6c2219..bb0fa649 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -34,9 +34,11 @@ jobs:
       matrix:
         include:
           - name: simple-1
-            tag: latest
+            tag: tag
+            tag-as-latest: true
           - name: simple-2
-            tag: latest
+            tag: tag
+            tag-as-latest: true
 
     steps:
       - name: Check out repository
@@ -56,7 +58,12 @@ jobs:
           ./build.sh "${CONTAINER_REGISTRY}/${{ matrix.name }}:${{ matrix.tag }}"
         working-directory: tests/images/${{ matrix.name }}
 
-      - name: Publish container image as ${{ env.CONTAINER_REGISTRY }}/${{ matrix.name }}:latest
+      - name: Tag image as latest
+        if: matrix.tag-as-latest && matrix.tag != 'latest'
+        run: |
+          podman tag "${CONTAINER_REGISTRY}/${{ matrix.name }}:${{ matrix.tag }}" "${CONTAINER_REGISTRY}/${{ matrix.name }}:latest"
+
+      - name: Publish container image ${{ env.CONTAINER_REGISTRY }}/${{ matrix.name }}:${{ matrix.tag }}
         if: github.event_name != 'pull_request'
         uses: redhat-actions/push-to-registry@v2
         with:
@@ -65,3 +72,13 @@ jobs:
           tags: ${{ matrix.tag }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish container image ${{ env.CONTAINER_REGISTRY }}/${{ matrix.name }}:latest
+        if: github.event_name != 'pull_request' && matrix.tag-as-latest && matrix.tag != 'latest'
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          registry: ${{ env.CONTAINER_REGISTRY }}
+          image: ${{ matrix.name }}
+          tags: latest
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}