From b274f81dbb530eae6719cef54758e791481c2afb Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 10 Jul 2025 16:56:50 -0400 Subject: [PATCH] Fix broken docker actions --- .github/workflows/docker-publish-rootless.yaml | 6 +++--- .github/workflows/docker-publish.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-publish-rootless.yaml b/.github/workflows/docker-publish-rootless.yaml index 140fd159..19d5e222 100644 --- a/.github/workflows/docker-publish-rootless.yaml +++ b/.github/workflows/docker-publish-rootless.yaml @@ -83,7 +83,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 - if: ${{ (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) && secrets.DOCKER_USERNAME != '' }} + if: ${{ (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -159,7 +159,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 - if: ${{ (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) && secrets.DOCKER_USERNAME != '' }} + if: ${{ (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -204,7 +204,7 @@ jobs: - name: Create manifest list and push Dockerhub id: push-dockerhub working-directory: /tmp/digests - if: ${{ (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) && secrets.DOCKER_USERNAME != '' }} + if: ${{ (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) run: | docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 44e7a271..f52287cb 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -78,7 +78,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 - if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) && ${{ secrets.DOCKER_USERNAME }} != '' + if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -152,7 +152,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 - if: ${{ secrets.DOCKER_USERNAME }} != '' + if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -195,7 +195,7 @@ jobs: - name: Create manifest list and push Dockerhub id: push-dockerhub working-directory: /tmp/digests - if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) && ${{ secrets.DOCKER_USERNAME }} != '' + if: (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) run: | docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)