From a6286be4997075a5f1b50acce50c8a5dcdfde1c4 Mon Sep 17 00:00:00 2001
From: Heather Ward <heather@dnastack.com>
Date: Fri, 21 Apr 2023 14:30:28 -0400
Subject: [PATCH] Tag docker image with version tag as well as long version

---
 .github/workflows/docker-build-push.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index e85090f..e0e6bac 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -16,9 +16,10 @@ jobs:
         id: prep
         run: |
           IMAGE="dnastack/wdl-ci"
-          VERSION_TAG=`git describe --tags --long --always`
+          VERSION_TAG=`git describe --tags`
+          LONG_VERSION_TAG=`git describe --tags --long --always`
           LATEST_TAG="latest"
-          ALL_TAGS="${IMAGE}:${VERSION_TAG},${IMAGE}:${LATEST_TAG}"
+          ALL_TAGS="${IMAGE}:${VERSION_TAG},${IMAGE}:${LONG_VERSION_TAG},${IMAGE}:${LATEST_TAG}"
 
           echo ::set-output name=all_tags::${ALL_TAGS}
       - name: set up QEMU