From 236d40dbee7fb138031233bf14eb7de9b44b9908 Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Wed, 12 Feb 2020 23:38:12 -0700
Subject: [PATCH] better tag logic

---
 .github/bin/docker-release.sh | 7 +++++--
 .github/workflows/main.yml    | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/bin/docker-release.sh b/.github/bin/docker-release.sh
index 3ae3766..726698f 100755
--- a/.github/bin/docker-release.sh
+++ b/.github/bin/docker-release.sh
@@ -6,8 +6,11 @@ export DOCKER_ORG="democraticcsi"
 export DOCKER_PROJECT="democratic-csi"
 export DOCKER_REPO="${DOCKER_ORG}/${DOCKER_PROJECT}"
 
-export GIT_BRANCH=${GITHUB_REF#refs/heads/}
-export GIT_TAG=${GITHUB_TAG}
+if [[ $GITHUB_REF == refs/tags/* ]]; then
+  export GIT_TAG=${GITHUB_REF#refs/tags/}
+else
+  export GIT_BRANCH=${GITHUB_REF#refs/heads/}
+fi
 
 if [[ -n "${GIT_TAG}" ]]; then
   docker buildx build --progress plain --pull --push --platform "${DOCKER_BUILD_PLATFORM}" -t ${DOCKER_REPO}:${GIT_TAG} .
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7e4930e..4b2fb6c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,6 @@ jobs:
       - uses: actions/checkout@v2
       - name: docker build
         run: |
-          env
           export ARCH=$([ $(uname -m) = "x86_64" ] && echo "amd64" || echo "arm64")
           mkdir -p ~/.docker/cli-plugins/
           wget -qO ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-${ARCH}