Simplify default version string
This commit is contained in:
1 parent
47cdf2b755
commit
937036aa64
6 files changed
+7
-7
No files matched your search
+1
-1
@@ -22,7 +22,7 @@ import (
|
||||
"github.com/weaveworks/weave/plugin/skel"
|
||||
)
|
||||
|
||||
var version = "(unreleased version)"
|
||||
var version = "unreleased"
|
||||
|
||||
var Log = common.Log
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
version = "(unreleased)"
|
||||
version = "unreleased"
|
||||
metricsAddr string
|
||||
)
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
"github.com/weaveworks/weave/proxy"
|
||||
)
|
||||
|
||||
var version = "(unreleased version)"
|
||||
var version = "unreleased"
|
||||
|
||||
var Log = common.Log
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ import (
|
||||
weave "github.com/weaveworks/weave/router"
|
||||
)
|
||||
|
||||
var version = "(unreleased version)"
|
||||
var version = "unreleased"
|
||||
|
||||
var Log = common.Log
|
||||
|
||||
|
||||
@@ -302,7 +302,7 @@ latest snapshot release using:
|
||||
sudo chmod a+x /usr/local/bin/weave
|
||||
weave setup
|
||||
|
||||
Snapshot releases report the script version as "(unreleased version)",
|
||||
Snapshot releases report the script version as "unreleased",
|
||||
and the container image versions as git hashes.
|
||||
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@ set -e
|
||||
|
||||
[ -n "$WEAVE_DEBUG" ] && set -x
|
||||
|
||||
SCRIPT_VERSION="(unreleased version)"
|
||||
SCRIPT_VERSION="unreleased"
|
||||
IMAGE_VERSION=latest
|
||||
[ "$SCRIPT_VERSION" = "(unreleased version)" ] || IMAGE_VERSION=$SCRIPT_VERSION
|
||||
[ "$SCRIPT_VERSION" = "unreleased" ] || IMAGE_VERSION=$SCRIPT_VERSION
|
||||
IMAGE_VERSION=${WEAVE_VERSION:-$IMAGE_VERSION}
|
||||
|
||||
# - Docker versions prior to 1.6 cannot pull images from DockerHub
|
||||
|
||||
Reference in new issue
Block a user