From 55d455d8b8ed9865bf095e707c6bd961eecb3933 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Mon, 6 Oct 2025 15:36:37 +1300 Subject: [PATCH 1/4] Use documented username/password for docker/login-action --- .github/workflows/docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 15059f6610..eacbe24642 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -54,14 +54,14 @@ jobs: uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GHCR_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - if: ${{ env.PUSH_PACKAGES == 'true' }} name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Prepare id: prep run: | From 34f799d5ae2cd4af7b9abc90ed802d62d0d1845b Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Mon, 6 Oct 2025 16:07:11 +1300 Subject: [PATCH 2/4] Don't skip docker/login-action steps --- .github/workflows/docker.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index eacbe24642..59003d5ed4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -49,15 +49,13 @@ jobs: uses: docker/setup-buildx-action@v3 with: version: latest - - if: ${{ env.PUSH_PACKAGES == 'true' }} - name: Login to GitHub Container Registry + - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - if: ${{ env.PUSH_PACKAGES == 'true' }} - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v3 with: username: ${{ vars.DOCKERHUB_USERNAME }} From 07fed22d22e16f06ef9fa6f4fbcb89579f1ae6be Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Mon, 6 Oct 2025 16:14:02 +1300 Subject: [PATCH 3/4] Restore Docker Hub vars to previous secrets --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 59003d5ed4..9bcb3bc8aa 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -58,8 +58,8 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ vars.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Prepare id: prep run: | From a03f3375e29ddbe7ebf6a23ef28c47bf1581f30d Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Mon, 6 Oct 2025 16:18:08 +1300 Subject: [PATCH 4/4] Restore to previous commit, since it yields "Username and password required" --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9bcb3bc8aa..59003d5ed4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -58,8 +58,8 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Prepare id: prep run: |