From 89d581b39dc2743d5e8d86e1901df4552efd0f8d Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 24 May 2017 16:24:51 -0700 Subject: [PATCH 1/2] Tag Docker images with a version number --- build-all.sh | 4 +++- build.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build-all.sh b/build-all.sh index 3c7fe03f1..51fedd3fc 100755 --- 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 index eed42130a..6c9157cfe 100755 --- 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 \ From 3208b0d37a1ba53290ffeb3897aa37ea651f7f4f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 24 May 2017 16:25:25 -0700 Subject: [PATCH 2/2] Update VERSION to 0.2-dev (to make our "in-between-releases" status explicit) --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3b04cfb60..a88289c7b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2 +0.2-dev