Fix secret use in step if condition

Author: mike-potter

.github/workflows/default.yml

@@ -24,6 +24,9 @@ jobs:
           - version: "8.1"
     env:
       VERSION: ${{ matrix.version }}
+      DOCKERHUB_ORG: ${{ secrets.DOCKERHUB_ORG }}
+      DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
     steps:
       - name: Checkout
@@ -32,13 +35,13 @@ jobs:
       - name: Prepare Tags
         id: prep
         run: |
-          DOCKERHUB_IMAGE=${{ secrets.DOCKERHUB_ORG }}/${GITHUB_REPOSITORY#*/}
+          DOCKERHUB_IMAGE=${DOCKERHUB_ORG}/${GITHUB_REPOSITORY#*/}
           GITHUB_IMAGE=${{ github.repository_owner }}/${GITHUB_REPOSITORY#*/}
           VERSION=php${{ matrix.version }}
 
           TAGS="ghcr.io/${GITHUB_IMAGE}:${VERSION}"
           # Only push to Dockerhub if secrets are set.
-          if [ ! -z "${{ secrets.DOCKERHUB_ORG }}" ]; then
+          if [ ! -z "${DOCKERHUB_ORG}" ]; then
             TAGS="$TAGS,${DOCKERHUB_IMAGE}:${VERSION}"
           fi
 
@@ -55,7 +58,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
-        if: ${{ github.event_name }} != 'pull_request' && ${{ secrets.DOCKERHUB_ORG }} != ''
+        if: ${{ github.event_name }} != 'pull_request' && ${{ env.DOCKERHUB_ORG }} != ''
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USER }}