From b50ceed2ae89b7e9f7beb9ccc14f051defb9122f Mon Sep 17 00:00:00 2001
From: Zakary Timson <zaktimson@gmail.com>
Date: Fri, 28 Jul 2023 17:48:42 +0000
Subject: [PATCH] Update docker/action.yaml

---
 docker/action.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/action.yaml b/docker/action.yaml
index 37a20e5..2d5ca47 100644
--- a/docker/action.yaml
+++ b/docker/action.yaml
@@ -34,7 +34,11 @@ runs:
       run: TAG=$([ -n "${{inputs.tag}}" ] && echo "${{inputs.tag}}" || [ "$GITHUB_REF" == "refs/heads/develop" ] && echo "latest" || echo "$GITHUB_REF_NAME" | sed -E "s/[_/]/-/g") >> $GITHUB_ENV
 
     - name: Build image
-      run: docker build --no-cache -t "${{inputs.image}}:$TAG" .
+      run: |
+        TAG=$([ -n "${{inputs.tag}}" ] && echo "${{inputs.tag}}" || [ "$GITHUB_REF" == "refs/heads/develop" ] && echo "latest" || echo "$GITHUB_REF_NAME" | sed -E "s/[_/]/-/g")
+        docker build --no-cache -t "${{inputs.image}}:$TAG" .
 
     - name: Push image
-      run: docker push "${{inputs.image}}:$TAG"
+      run: |
+        TAG=$([ -n "${{inputs.tag}}" ] && echo "${{inputs.tag}}" || [ "$GITHUB_REF" == "refs/heads/develop" ] && echo "latest" || echo "$GITHUB_REF_NAME" | sed -E "s/[_/]/-/g")
+        docker push "${{inputs.image}}:$TAG"