From 6350d9180061820642cec5b239192b402bbfbd22 Mon Sep 17 00:00:00 2001
From: Admiralawkbar <Admiralawkbar@github.com>
Date: Thu, 3 Dec 2020 14:39:32 -0600
Subject: [PATCH] fix vars

---
 .github/workflows/deploy-DEV.yml  |  2 +-
 .github/workflows/deploy-PROD.yml | 39 +++++++++++++++----------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/deploy-DEV.yml b/.github/workflows/deploy-DEV.yml
index b2ebf5c5..1c993ef0 100644
--- a/.github/workflows/deploy-DEV.yml
+++ b/.github/workflows/deploy-DEV.yml
@@ -59,7 +59,7 @@ jobs:
           password: ${{ secrets.GCR_TOKEN }}
           registry: ghcr.io
           image_name: github/super-linter
-          image_tag: "${GITHUB_SHA}"
+          image_tag: ${GITHUB_SHA}
           dockerfile: Dockerfile
           build_extra_args: "--build-arg=BUILD_DATE=${BUILD_DATE} --build-arg=BUILD_REVISION=${GITHUB_SHA} --build-arg=BUILD_VERSION=${GITHUB_SHA}"
         env:
diff --git a/.github/workflows/deploy-PROD.yml b/.github/workflows/deploy-PROD.yml
index 9839a06e..82012c2c 100644
--- a/.github/workflows/deploy-PROD.yml
+++ b/.github/workflows/deploy-PROD.yml
@@ -43,28 +43,27 @@ jobs:
       # Run Deploy script #
       #####################
       - name: Deploy latest image to DockerHub
-        env:
-          # Set the Env Vars
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          IMAGE_REPO: github/super-linter
-          IMAGE_VERSION: latest
-          DOCKERFILE_PATH: Dockerfile
-          REGISTRY: Docker
-        shell: bash
-        run: .automation/upload-docker.sh
+        uses: whoan/docker-build-with-cache-action@v5
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          image_name: github/super-linter
+          image_tag: "latest,v3"
+          dockerfile: Dockerfile
+          build_extra_args: "--build-arg=BUILD_DATE=${BUILD_DATE} --build-arg=BUILD_REVISION=${GITHUB_SHA} --build-arg=BUILD_VERSION=${GITHUB_SHA}"
+          push_image_and_stages: true
 
       #############################
       # Run Deploy script for GPR #
       #############################
       - name: Deploy Latest image to GitHub Container Registry
-        env:
-          # Set the Env Vars
-          GCR_USERNAME: ${{ secrets.GCR_USERNAME }}
-          GCR_TOKEN: ${{ secrets.GCR_TOKEN }}
-          IMAGE_REPO: github/super-linter
-          IMAGE_VERSION: latest
-          DOCKERFILE_PATH: Dockerfile
-          REGISTRY: GCR
-        shell: bash
-        run: .automation/upload-docker.sh
+        uses: whoan/docker-build-with-cache-action@v5
+        with:
+          username: ${{ secrets.GCR_USERNAME }}
+          password: ${{ secrets.GCR_TOKEN }}
+          registry: ghcr.io
+          image_name: github/super-linter
+          image_tag: "latest,v3"
+          dockerfile: Dockerfile
+          build_extra_args: "--build-arg=BUILD_DATE=${BUILD_DATE} --build-arg=BUILD_REVISION=${GITHUB_SHA} --build-arg=BUILD_VERSION=${GITHUB_SHA}"
+          push_image_and_stages: true