From d520bd1a6516d183f6d148b04734edb90e069f82 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Fri, 22 Dec 2023 16:24:04 +0000 Subject: [PATCH 1/3] Fix image-deps-update action overwrite input --- .github/workflows/image-deps-updater.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/image-deps-updater.yaml b/.github/workflows/image-deps-updater.yaml index fe57dfda89..85a6a2aaab 100644 --- a/.github/workflows/image-deps-updater.yaml +++ b/.github/workflows/image-deps-updater.yaml @@ -45,7 +45,7 @@ jobs: image-name: index.docker.io/kotsadm/minio:${{ steps.get-tags.outputs.minio-tag }} registry-username: ${{ secrets.DOCKERHUB_USER }} registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} - overwrite: ${{ github.event.inputs.overwrite }} + overwrite: ${{ github.event.inputs.overwrite || 'false' }} - name: Build and push rqlite image uses: ./.github/actions/build-push-image-with-apko @@ -54,7 +54,7 @@ jobs: image-name: index.docker.io/kotsadm/rqlite:${{ steps.get-tags.outputs.rqlite-tag }} registry-username: ${{ secrets.DOCKERHUB_USER }} registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} - overwrite: ${{ github.event.inputs.overwrite }} + overwrite: ${{ github.event.inputs.overwrite || 'false' }} - name: Build and push dex image uses: ./.github/actions/build-push-image-with-apko @@ -63,7 +63,7 @@ jobs: image-name: index.docker.io/kotsadm/dex:${{ steps.get-tags.outputs.dex-tag }} registry-username: ${{ secrets.DOCKERHUB_USER }} registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} - overwrite: ${{ github.event.inputs.overwrite }} + overwrite: ${{ github.event.inputs.overwrite || 'false' }} update-image-deps: From cf1e41407991336be1ed5b434dcd94a2fa1eae9c Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Fri, 22 Dec 2023 16:32:12 +0000 Subject: [PATCH 2/3] updates --- .github/actions/build-push-image-with-apko/action.yml | 2 +- .github/workflows/image-deps-updater.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/build-push-image-with-apko/action.yml b/.github/actions/build-push-image-with-apko/action.yml index bd0a312e2f..e48fe256b7 100644 --- a/.github/actions/build-push-image-with-apko/action.yml +++ b/.github/actions/build-push-image-with-apko/action.yml @@ -28,7 +28,7 @@ runs: using: "composite" steps: - id: check-image-exists - if: ${{ inputs.overwrite == 'false' }} + if: ${{ inputs.overwrite == '' || inputs.overwrite == 'false' }} shell: bash run: | set -euo pipefail diff --git a/.github/workflows/image-deps-updater.yaml b/.github/workflows/image-deps-updater.yaml index 85a6a2aaab..fe57dfda89 100644 --- a/.github/workflows/image-deps-updater.yaml +++ b/.github/workflows/image-deps-updater.yaml @@ -45,7 +45,7 @@ jobs: image-name: index.docker.io/kotsadm/minio:${{ steps.get-tags.outputs.minio-tag }} registry-username: ${{ secrets.DOCKERHUB_USER }} registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} - overwrite: ${{ github.event.inputs.overwrite || 'false' }} + overwrite: ${{ github.event.inputs.overwrite }} - name: Build and push rqlite image uses: ./.github/actions/build-push-image-with-apko @@ -54,7 +54,7 @@ jobs: image-name: index.docker.io/kotsadm/rqlite:${{ steps.get-tags.outputs.rqlite-tag }} registry-username: ${{ secrets.DOCKERHUB_USER }} registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} - overwrite: ${{ github.event.inputs.overwrite || 'false' }} + overwrite: ${{ github.event.inputs.overwrite }} - name: Build and push dex image uses: ./.github/actions/build-push-image-with-apko @@ -63,7 +63,7 @@ jobs: image-name: index.docker.io/kotsadm/dex:${{ steps.get-tags.outputs.dex-tag }} registry-username: ${{ secrets.DOCKERHUB_USER }} registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} - overwrite: ${{ github.event.inputs.overwrite || 'false' }} + overwrite: ${{ github.event.inputs.overwrite }} update-image-deps: From 1e4c93a7e7d7c9496f320cdeb93c891f1c1dddf9 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Fri, 22 Dec 2023 16:51:19 +0000 Subject: [PATCH 3/3] if not true --- .github/actions/build-push-image-with-apko/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-push-image-with-apko/action.yml b/.github/actions/build-push-image-with-apko/action.yml index e48fe256b7..98ecb0b4bc 100644 --- a/.github/actions/build-push-image-with-apko/action.yml +++ b/.github/actions/build-push-image-with-apko/action.yml @@ -28,7 +28,7 @@ runs: using: "composite" steps: - id: check-image-exists - if: ${{ inputs.overwrite == '' || inputs.overwrite == 'false' }} + if: ${{ inputs.overwrite != 'true' }} shell: bash run: | set -euo pipefail