GitHub workflows: Delete base image before pushing container images

This is a aworkaround for https://github.com/redhat-actions/push-to-registry confusing the the just built image with the base image; see redhat-actions/push-to-registry#66
SGSGermany · Jun 17, 2023 · ed0b1a3 · ed0b1a3
1 parent 2356c2e
commit ed0b1a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.github/workflows/container-auto-update.yml b/.github/workflows/container-auto-update.yml
@@ -73,6 +73,12 @@ jobs:
         run: |
           buildah unshare ./build.sh
 
+      # Workaround for https://github.com/redhat-actions/push-to-registry/issues/66
+      - name: Delete base image
+        if: ${{ env.BUILD_ACTION != '' }}
+        run: |
+          podman rmi "$(. ./container.env ; echo "$BASE_IMAGE")"
+
       - name: Container image metadata
         run: |
           "$CI_TOOLS_PATH/containers/get-metadata.sh" "$REGISTRY/$OWNER" "$IMAGE:latest"

diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml
@@ -60,6 +60,11 @@ jobs:
         run: |
           buildah unshare ./build.sh
 
+      # Workaround for https://github.com/redhat-actions/push-to-registry/issues/66
+      - name: Delete base image
+        run: |
+          podman rmi "$(. ./container.env ; echo "$BASE_IMAGE")"
+
       - name: Container image metadata
         run: |
           podman image inspect "localhost/$IMAGE:${TAGS%% *}"