From af1df5edfdfd73e31b9896e2f7895bae0b187470 Mon Sep 17 00:00:00 2001 From: Christian Winther Date: Mon, 15 Jan 2024 20:24:02 +0000 Subject: [PATCH] ooops --- .github/workflows/docker.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bda7004e6..591c9d22a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -106,11 +106,19 @@ jobs: # at https://github.com///settings/variables/actions DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME || 'pixelfed' }} + # Set the repo variable [DOCKER_HUB_ORGANISATION] to override the default + # at https://github.com///settings/variables/actions + DOCKER_HUB_ORGANISATION: ${{ vars.DOCKER_HUB_ORGANISATION || 'pixelfed' }} + + # Set the repo variable [DOCKER_HUB_REPO] to override the default + # at https://github.com///settings/variables/actions + DOCKER_HUB_REPO: ${{ vars.DOCKER_HUB_REPO || 'pixelfed' }} + # For Docker Hub pushing to work, you need the secret [DOCKER_HUB_TOKEN] # set to your Personal Access Token at https://github.com///settings/secrets/actions # # ! NOTE: no [login] or [push] will happen to Docker Hub until this secret is set! - HAS_DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN != '' }} + HAS_DOCKER_HUB_CONFIGURED: ${{ secrets.DOCKER_HUB_TOKEN != '' }} steps: - name: Checkout Code @@ -135,7 +143,7 @@ jobs: # See: https://github.com/docker/login-action?tab=readme-ov-file#docker-hub - name: Login to Docker Hub registry (conditionally) - if: ${{ env.HAS_DOCKER_HUB_TOKEN == true }} + if: ${{ env.HAS_DOCKER_HUB_CONFIGURED == true }} uses: docker/login-action@v3 with: username: ${{ env.DOCKER_HUB_USERNAME }} @@ -147,7 +155,7 @@ jobs: with: images: | name=ghcr.io/${{ github.repository }},enable=true - name=${{ vars.GITHUB_REPOSITORY }},enable=${{ env.HAS_DOCKER_HUB_TOKEN }} + name=${{ env.DOCKER_HUB_ORGANISATION }}/${{ env.DOCKER_HUB_REPO }},enable=${{ env.HAS_DOCKER_HUB_CONFIGURED }} flavor: | latest=auto suffix=-${{ matrix.target_runtime }}-${{ matrix.php_version }}