From 75f48fb52010cb745c3d240a4e0d05026e008143 Mon Sep 17 00:00:00 2001
From: Tolga Ceylan <tolga.ceylan@gmail.com>
Date: Tue, 13 Feb 2018 18:39:37 -0800
Subject: [PATCH] fn: dind image version fixes (#769)

1) use dind docker version instead of installed local docker
2) do not skip pre-release semver handling, eg. 17.12.0-ce
---
 images/dind/build.sh   | 12 ++++++++----
 images/dind/release.sh |  9 ++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/images/dind/build.sh b/images/dind/build.sh
index 16ad2c460..1e569aaf9 100755
--- a/images/dind/build.sh
+++ b/images/dind/build.sh
@@ -1,12 +1,16 @@
-set -ex
+#!/bin/bash
+set -exo pipefail
 
 docker build --build-arg HTTPS_PROXY --build-arg HTTP_PROXY -t fnproject/dind:latest .
 
 # Match version with Docker version
-version=$(docker run --rm -v "$PWD":/app treeder/bump  --extract --input "`docker -v`")
+docker_info=$(docker run --rm fnproject/dind:latest docker -v 2>/dev/null | grep "^Docker version")
+version=$(echo $docker_info | cut -d ' ' -f 3 | tr -d ,)
+
 echo "Version: $version"
-M=$(docker run --rm treeder/bump --format M --input "$version")
-Mm=$(docker run --rm treeder/bump --format M.m --input "$version")
+
+M=$(echo $version | cut -d '.' -f 1)
+Mm=$(echo $version | cut -d '.' -f 1,2)
 
 # Tag these up so that they're available for the local build process,
 # if necessary
diff --git a/images/dind/release.sh b/images/dind/release.sh
index a234bd98e..8abcf3ffe 100755
--- a/images/dind/release.sh
+++ b/images/dind/release.sh
@@ -16,10 +16,13 @@ fi
 # after any related tests have passed.
 
 # Match version with Docker version
-version=$(docker run --rm -v "$PWD":/app treeder/bump  --extract --input "`docker -v`")
+docker_info=$(docker run --rm fnproject/dind:latest docker -v 2>/dev/null | grep "^Docker version")
+version=$(echo $docker_info | cut -d ' ' -f 3 | tr -d ,)
+
 echo "Version: $version"
-M=$(docker run --rm treeder/bump --format M --input "$version")
-Mm=$(docker run --rm treeder/bump --format M.m --input "$version")
+
+M=$(echo $version | cut -d '.' -f 1)
+Mm=$(echo $version | cut -d '.' -f 1,2)
 
 # Calculate new release version
 DIND_NEW=$(echo "$DIND_PREV" | perl -pe 's/\d+\.\d+\.\K(\d+)/$1+1/e')