From 268d6681078bd9d6019c88a960e2782067a1b84b Mon Sep 17 00:00:00 2001
From: Tom Foster <tom@tcpip.uk>
Date: Mon, 22 Apr 2024 20:15:39 +0100
Subject: [PATCH] Move secrets usage to env definition

---
 .github/workflows/ci.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a9737b6..5ca976f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -186,13 +186,19 @@ jobs:
 
             - name: Login to Docker Hub
               uses: docker/login-action@v3
-              if: ${{ (vars.DOCKER_USERNAME != '') && (secrets.DOCKERHUB_TOKEN != '') }}
+              env:
+                  DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+                  DOCKER_USERNAME: ${{ vars.DOCKER_USERNAME }}
+              if: ${{ (env.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
               with:
-                  username: ${{ vars.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+                  username: ${{ env.DOCKER_USERNAME }}
+                  password: ${{ env.DOCKERHUB_TOKEN }}
 
             - name: Create and push manifest to Docker Hub
-              if: ${{ (vars.DOCKER_USERNAME != '') && (secrets.DOCKERHUB_TOKEN != '') }}
+              env:
+                  DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+                  DOCKER_USERNAME: ${{ vars.DOCKER_USERNAME }}
+              if: ${{ (env.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
               run: |
                   REPO_DOCKER="docker.io/${{ github.repository }}"
                   SHA_TAG="${{ github.ref_name }}-${{ github.sha }}"