diff --git a/.travis.yml b/.travis.yml index 1eb3db123..62d89181f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ script: - | if [ -n "${TRAVIS_TAG}" ]; then export RELEASE_VER=${TRAVIS_TAG} - elif [ "${TRAVIS_BRANCH}" == "1.2.13" ]; then - export DOCKER_IMAGE_TAG=1.2.13 + elif [ "${TRAVIS_BRANCH}" == "master" ]; then + export DOCKER_IMAGE_TAG=master-latest else export RELEASE_VER=`git rev-parse --short HEAD` fi diff --git a/pkg/version/version.go b/pkg/version/version.go index 4baf9fb0d..b905af09c 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -24,7 +24,7 @@ const ( // // These variables typically come from -ldflags settings. var ( - gitVersion = "1.2.13" + gitVersion = "master-latest" gitCommit = "" // sha1 from git, output of $(git rev-parse HEAD) buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ') kbVerRegex = regexp.MustCompile(`^(v\d+\.\d+\.\d+)(.*)`)