Merge pull request #5 from tianon/ver

Tag Docker images with a version number
vicamo · May 24, 2017 · 4e6bdec · 4e6bdec
2 parents 12cae69 + 3208b0d
commit 4e6bdec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2
+0.2-dev
diff --git a/build-all.sh b/build-all.sh
@@ -41,7 +41,9 @@ timestamp="${1:-}"; shift || eusage 'missing timestamp'
 mkdir -p "$outputDir"
 outputDir="$(readlink -f "$outputDir")"
 
-dockerImage='debuerreotype/debuerreotype'
+ver="$("$thisDir/scripts/debuerreotype-version")"
+ver="${ver%% *}"
+dockerImage="debuerreotype/debuerreotype:$ver"
 [ -z "$build" ] || docker build -t "$dockerImage" "$thisDir"
 
 mirror="$("$thisDir/scripts/.snapshot-url.sh" "$timestamp")"

diff --git a/build.sh b/build.sh
@@ -40,7 +40,9 @@ if docker info | grep -q apparmor; then
 	)
 fi
 
-dockerImage='debuerreotype/debuerreotype'
+ver="$("$thisDir/scripts/debuerreotype-version")"
+ver="${ver%% *}"
+dockerImage="debuerreotype/debuerreotype:$ver"
 [ -z "$build" ] || docker build -t "$dockerImage" "$thisDir"
 
 docker run \