Image build and push scripts now look at annotated git tags to

determine the version

CHANGELOG.md

@@ -6,8 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.1.1] - 2017-12-04
+### Changed
+- Build scripts now look at git tags to determine version and tags to use.
+
 ## 0.1.0 - 2017-12-04
 
 The first tagged version.
 
-[Unreleased]: https://github.com/cyberark/conjur/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/cyberark/conjur/compare/v0.1.1...HEAD
+[0.1.1]: https://github.com/cyberark/conjur/compare/v0.1.0...v0.1.1

Jenkinsfile

@@ -13,6 +13,7 @@ pipeline {
     stage('Checkout SCM') {
       steps {
         checkout scm
+        sh 'git fetch' // to pull the tags
       }
     }
     stage('Build Docker image') {

VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

build.sh

@@ -1,6 +1,8 @@
 #!/bin/bash -ex
 
-TAG="$(< VERSION)-$(git rev-parse --short HEAD)"
+. git_tag.sh
+
+TAG="$(git_tag)"
 RUN_DEV=true
 
 while [[ $# -gt 0 ]]

git_tag.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Gets the version string of the current HEAD without the `v` prefix.
+git_tag() {
+  local GIT_TAG="$(git describe --abbrev $1)"
+  echo "${GIT_TAG#v}"
+}

push-image.sh

@@ -5,7 +5,9 @@
 # Release images can be created by passing the desired tag to this script
 # Ex: ./push-image 4.9.5.1
 
-TAG="${1:-$(< VERSION)-$(git rev-parse --short HEAD)}"
+. git_tag.sh
+
+TAG="${1:-$(git_tag)}"
 
 SOURCE_IMAGE='conjur'
 INTERNAL_IMAGE='registry.tld/conjur'