kubeflow
/
spark-operator
mirror of https://github.com/kubeflow/spark-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow any tag not just annotated tags (#990) 

Change the use of git describe to allow any tag including non-annotated
tags.
This commit is contained in:
Jim Kleckner 2020-07-29 08:52:01 -07:00 committed by GitHub
parent 5b2fe92181
commit f30dd15352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -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