Merge branch 'master' into update-images

Author: mike-potter

.github/workflows/default.yml

@@ -29,17 +29,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Prepare
+      - name: Prepare Tags
         id: prep
         run: |
-          DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/}
+          DOCKERHUB_IMAGE=${{ secrets.DOCKERHUB_ORG }}/${GITHUB_REPOSITORY#*/}
+          GITHUB_IMAGE=${{ github.repository_owner }}/${GITHUB_REPOSITORY#*/}
           VERSION=php${{ matrix.version }}
 
-          TAGS="${DOCKER_IMAGE}:${VERSION},ghcr.io/${DOCKER_IMAGE}:${VERSION}"
+          TAGS="ghcr.io/${GITHUB_IMAGE}:${VERSION}"
+          # Only push to Dockerhub if secrets are set.
+          if [ ! -z "${{ secrets.DOCKERHUB_ORG }}" ]; then
+            TAGS="$TAGS,${DOCKERHUB_IMAGE}:${VERSION}"
+          fi
 
           # Set output parameters.
           echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=docker_image::${DOCKER_IMAGE}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -51,11 +55,11 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' && secrets.DOCKERHUB_ORG != ''
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'