Dynamically set version for ubuntu console

rancher · Mar 20, 2015 · 3f1d8ad · 3f1d8ad
1 parent 189e40c
commit 3f1d8ad
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -12,12 +12,11 @@ docker run --rm -it -e CHOWN_ID=$(id -u) -v $(pwd)/dist:/source/target $DOCKER_I
 # Stupidest argparse ever
 if echo "$@" | grep -q -- '--images'; then
     ./scripts/build-extra-images
-    echo 'docker push rancher/ubuntuconsole'
 fi
 
 # And again
 if echo "$@" | grep -q -- '--push'; then
-    docker push rancher/ubuntuconsole
+    docker push rancher/ubuntuconsole:$(<./scripts/version)
 fi
 
 ls -l dist/artifacts
diff --git a/config/default.go b/config/default.go
@@ -244,7 +244,7 @@ func NewConfig() *Config {
 							"--ipc=host " +
 							"--net=host " +
 							"--pid=host " +
-							"rancher/ubuntuconsole:v0.0.2",
+							"rancher/ubuntuconsole:" + VERSION,
 					},
 				},
 			},

diff --git a/scripts/build-extra-images b/scripts/build-extra-images
@@ -7,7 +7,7 @@ source scripts/build-common
 
 >${BUILD}/tags
 for i in scripts/extraimages/[0-9]*; do
-    tag=$(echo $i | cut -f2 -d-)
+    tag=$(echo $i | cut -f2 -d-):$(<scripts/version)
     echo Building $tag
     docker build -t rancher/$tag -f $i .
     echo $tag >> ${BUILD}/tags

diff --git a/scripts/version b/scripts/version
@@ -1 +1 @@
-VERSION=v0.2.0
+VERSION=v0.2.1