Merge pull request docker-archive-public#3272 from nathanleclaire/release_v-0.7.0-rc2_bump

nathanleclaire · nathanleclaire · commit 60dbecbbd5d7 · 2016-04-04T15:39:58.000-07:00
Bump version and modify release script for 0.7.0-rc2
diff --git a/script/release.sh b/script/release.sh
@@ -6,7 +6,7 @@ PROJECT_URL="git@github.com:${GITHUB_USER}/${GITHUB_REPO}"
 
 function usage {
   echo "Usage: "
-  echo "   GITHUB_TOKEN=XXXXX ${0} 0.6.x"
+  echo "   GITHUB_TOKEN=XXXXX ${0} [X.Y.Z]"
 }
 
 function display {
@@ -61,7 +61,7 @@ GITHUB_VERSION="v${VERSION}"
 RELEASE_DIR="$(dirname "$(git rev-parse --show-toplevel)")/release-${VERSION}"
 GITHUB_RELEASE_FILE="github-release-${VERSION}.md"
 
-LAST_RELEASE_VERSION=$(git describe --abbrev=0 --tags)
+LAST_RELEASE_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1))
 checkError "Unable to find current version tag"
 
 display "Starting release from ${LAST_RELEASE_VERSION} to ${GITHUB_VERSION} on ${PROJECT_URL} with token ${GITHUB_TOKEN}"
diff --git a/version/version.go b/version/version.go
@@ -7,7 +7,7 @@ import (
 
 var (
 	// Version should be updated by hand at each release
-	Version = "0.7.0-rc1"
+	Version = "0.7.0-rc2"
 
 	// GitCommit will be overwritten automatically by the build system
 	GitCommit = "HEAD"
