Allow any tag not just annotated tags (#990)

Change the use of git describe to allow any tag including non-annotated tags.
kubeflow · Jul 29, 2020 · f30dd15 · f30dd15
1 parent 5b2fe92
commit f30dd15
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,12 +17,12 @@ build:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY ;
     - >
       if [ "${SPARK_REGISTRY}" != "" -a "${SPARK_VERSION}" != "" ] ; then
-        tagStamp=$(git describe --dirty)_${SPARK_VERSION}
+        tagStamp=$(git describe --tags --dirty)_${SPARK_VERSION}
         echo Using SPARK_IMAGE ${SPARK_REGISTRY}:${SPARK_VERSION}
         echo CI_REGISTRY_IMAGE_TAG is ${CI_REGISTRY_IMAGE}/spark-operator:${tagStamp}
         docker build --build-arg SPARK_IMAGE=${SPARK_REGISTRY}:${SPARK_VERSION} -t ${CI_REGISTRY_IMAGE}/spark-operator:${tagStamp} .
       else
-        tagStamp=$(git describe --dirty) ; echo tagStamp is ${tagStamp} ;
+        tagStamp=$(git describe --tags --dirty) ; echo tagStamp is ${tagStamp} ;
         echo CI_REGISTRY_IMAGE_TAG is ${CI_REGISTRY_IMAGE}/spark-operator:${tagStamp}
         docker build -t ${CI_REGISTRY_IMAGE}/spark-operator:${tagStamp} .
       fi