From 05fc4cfbf0c8c73bcd1e8f67e00325ea08adeac7 Mon Sep 17 00:00:00 2001 From: Jonathan Yu Date: Thu, 10 Feb 2022 21:17:24 +0000 Subject: [PATCH 1/3] chore: update Docker image publish workflow * Use official action to log in to Docker Hub * Run using pinned ubuntu-20.04 environment --- .github/workflows/docker.yaml | 22 ++++++++++++++++------ ci/steps/docker-buildx-push.sh | 5 ----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index fe3cfee53c52..7886b90f9d92 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -6,13 +6,19 @@ on: workflow_dispatch: release: - types: [released] + types: + - released + + pull_request: + branches: + - main jobs: docker-images: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -20,9 +26,13 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Run ./ci/steps/docker-buildx-push.sh run: ./ci/steps/docker-buildx-push.sh env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + GITHUB_TOKEN: ${{ github.token }} diff --git a/ci/steps/docker-buildx-push.sh b/ci/steps/docker-buildx-push.sh index 79b205580291..75688cb568f4 100755 --- a/ci/steps/docker-buildx-push.sh +++ b/ci/steps/docker-buildx-push.sh @@ -26,11 +26,6 @@ main() { # Download the release-packages artifact download_artifact release-packages ./release-packages - # Login to Docker - if [[ ${CI-} ]]; then - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - fi - docker buildx bake -f ci/release-image/docker-bake.hcl --push } From b3777832530e7d8c5872e91f6bcb2aad3af8cc45 Mon Sep 17 00:00:00 2001 From: Jonathan Yu Date: Thu, 10 Feb 2022 21:22:06 +0000 Subject: [PATCH 2/3] re-push image --- ci/steps/docker-buildx-push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/steps/docker-buildx-push.sh b/ci/steps/docker-buildx-push.sh index 75688cb568f4..0c531d901787 100755 --- a/ci/steps/docker-buildx-push.sh +++ b/ci/steps/docker-buildx-push.sh @@ -20,7 +20,7 @@ main() { if version_exists; then echo "$VERSION is already pushed" - return + # return fi # Download the release-packages artifact From 65de5a8a172ea4e6ac5df21847ff581090a268c9 Mon Sep 17 00:00:00 2001 From: Jonathan Yu Date: Thu, 10 Feb 2022 22:33:17 +0000 Subject: [PATCH 3/3] do not push --- .github/workflows/docker.yaml | 4 ---- ci/steps/docker-buildx-push.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 7886b90f9d92..ec1792b27be8 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -9,10 +9,6 @@ on: types: - released - pull_request: - branches: - - main - jobs: docker-images: runs-on: ubuntu-20.04 diff --git a/ci/steps/docker-buildx-push.sh b/ci/steps/docker-buildx-push.sh index 0c531d901787..75688cb568f4 100755 --- a/ci/steps/docker-buildx-push.sh +++ b/ci/steps/docker-buildx-push.sh @@ -20,7 +20,7 @@ main() { if version_exists; then echo "$VERSION is already pushed" - # return + return fi # Download the release-packages artifact