From ed479dace9def32965c86f1baea35bfbe107a084 Mon Sep 17 00:00:00 2001 From: Alex Couture-Beil Date: Tue, 24 Oct 2023 10:01:21 -0700 Subject: [PATCH] dockerhub readme: use token instead of password (#3419) The earthly automation dockerhub user has changed and now requires us to use a seperate token rather than password for accessing the API. --- .github/workflows/reusable-earthly-image-tests.yml | 4 ++-- .github/workflows/update-docker-hub-readmes.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reusable-earthly-image-tests.yml b/.github/workflows/reusable-earthly-image-tests.yml index 84a83767..352a0818 100644 --- a/.github/workflows/reusable-earthly-image-tests.yml +++ b/.github/workflows/reusable-earthly-image-tests.yml @@ -55,7 +55,7 @@ jobs: - name: Build the earthly docker image run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} +earthly-docker --TAG=image-test - name: "Run the earthly image tests" - run: FRONTEND=${{inputs.BINARY}} EARTHLY_IMAGE=earthly/earthly:image-test DOCKERHUB_MIRROR_USERNAME="${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" DOCKERHUB_MIRROR_PASSWORD="${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" DOCKERHUB_USERNAME="${{ secrets.DOCKERHUB_USERNAME }}" DOCKERHUB_PASSWORD="${{ secrets.DOCKERHUB_PASSWORD }}" ./scripts/tests/earthly-image.sh + run: FRONTEND=${{inputs.BINARY}} EARTHLY_IMAGE=earthly/earthly:image-test DOCKERHUB_MIRROR_USERNAME="${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" DOCKERHUB_MIRROR_PASSWORD="${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" DOCKERHUB_USERNAME="${{ secrets.DOCKERHUB_USERNAME }}" DOCKERHUB_PASSWORD="${{ secrets.DOCKERHUB_TOKEN }}" ./scripts/tests/earthly-image.sh - name: Buildkit logs (runs on failure) run: ${{inputs.SUDO}} ${{inputs.BINARY}} logs earthly-buildkitd if: ${{ failure() && ! inputs.USE_SATELLITE }} @@ -92,7 +92,7 @@ jobs: - name: Build the earthly docker image run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} +earthly-docker --TAG=image-test - name: "Run the earthly image sat tests" - run: FRONTEND=${{inputs.BINARY}} EARTHLY_IMAGE=earthly/earthly:image-test DOCKERHUB_MIRROR_USERNAME="${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" DOCKERHUB_MIRROR_PASSWORD="${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" DOCKERHUB_USERNAME="${{ secrets.DOCKERHUB_USERNAME }}" DOCKERHUB_PASSWORD="${{ secrets.DOCKERHUB_PASSWORD }}" ./scripts/tests/earthly-image-sat.sh + run: FRONTEND=${{inputs.BINARY}} EARTHLY_IMAGE=earthly/earthly:image-test DOCKERHUB_MIRROR_USERNAME="${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" DOCKERHUB_MIRROR_PASSWORD="${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" DOCKERHUB_USERNAME="${{ secrets.DOCKERHUB_USERNAME }}" DOCKERHUB_PASSWORD="${{ secrets.DOCKERHUB_TOKEN }}" ./scripts/tests/earthly-image-sat.sh - name: Buildkit logs (runs on failure) run: ${{inputs.SUDO}} ${{inputs.BINARY}} logs earthly-buildkitd || true if: ${{ failure() && ! inputs.USE_SATELLITE }} diff --git a/.github/workflows/update-docker-hub-readmes.yml b/.github/workflows/update-docker-hub-readmes.yml index 75f6dcdd..5b0b21c5 100644 --- a/.github/workflows/update-docker-hub-readmes.yml +++ b/.github/workflows/update-docker-hub-readmes.yml @@ -21,7 +21,7 @@ jobs: uses: peter-evans/dockerhub-description@6515ba32ab40bc2d4fa334365b771770366628ff with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + password: ${{ secrets.DOCKERHUB_TOKEN }} repository: earthly/earthly readme-filepath: ./docs/docker-images/all-in-one.md short-description: ${{ github.event.repository.description }} @@ -29,7 +29,7 @@ jobs: uses: peter-evans/dockerhub-description@6515ba32ab40bc2d4fa334365b771770366628ff with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + password: ${{ secrets.DOCKERHUB_TOKEN }} repository: earthly/buildkitd readme-filepath: ./docs/docker-images/buildkit-standalone.md short-description: Standalone Earthly buildkitd image @@ -37,7 +37,7 @@ jobs: uses: peter-evans/dockerhub-description@6515ba32ab40bc2d4fa334365b771770366628ff with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + password: ${{ secrets.DOCKERHUB_TOKEN }} repository: earthly/dind readme-filepath: ./docs/docker-images/dind.md short-description: Standalone Earthly buildkitd image