From 87e55b600747dcdd34614c65f3d9939e03f98549 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Wed, 13 Dec 2023 15:41:06 +0000 Subject: [PATCH] fix rqlite prod image --- .../build-push-image-with-apko/action.yml | 24 +++++++++---------- .github/workflows/build-test.yaml | 4 +++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/actions/build-push-image-with-apko/action.yml b/.github/actions/build-push-image-with-apko/action.yml index e2b474b56b..e09902d6d7 100644 --- a/.github/actions/build-push-image-with-apko/action.yml +++ b/.github/actions/build-push-image-with-apko/action.yml @@ -22,20 +22,20 @@ inputs: runs: using: "composite" steps: - - id: check-image-exists - shell: bash - run: | - set -euo pipefail - if docker manifest inspect ${{ inputs.image-name }} > /dev/null 2>&1; then - echo "Image already exists. Will not overwrite." - echo "image-exists=true" >> "$GITHUB_OUTPUT" - else - echo "Image does not exist. Will build and push." - echo "image-exists=false" >> "$GITHUB_OUTPUT" - fi + # - id: check-image-exists + # shell: bash + # run: | + # set -euo pipefail + # if docker manifest inspect ${{ inputs.image-name }} > /dev/null 2>&1; then + # echo "Image already exists. Will not overwrite." + # echo "image-exists=true" >> "$GITHUB_OUTPUT" + # else + # echo "Image does not exist. Will build and push." + # echo "image-exists=false" >> "$GITHUB_OUTPUT" + # fi - uses: chainguard-images/actions/apko-publish@main - if: ${{ steps.check-image-exists.outputs.image-exists == 'false' }} + # if: ${{ steps.check-image-exists.outputs.image-exists == 'false' }} with: config: ${{ inputs.apko-config }} archs: x86_64 diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 80adb0f0f8..6154f1c7ef 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -438,7 +438,9 @@ jobs: - uses: ./.github/actions/build-push-image-with-apko with: apko-config: deploy/rqlite/apko.yaml - image-name: ttl.sh/automated-${{ github.run_id }}/rqlite:${{ steps.dotenv.outputs.RQLITE_TAG }} + image-name: index.docker.io/kotsadm/rqlite:${{ steps.dotenv.outputs.RQLITE_TAG }} + registry-username: ${{ secrets.DOCKERHUB_USER }} + registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} push-dex: