From f30e7df43d862e38512be6213c8aca1b5d8b1df5 Mon Sep 17 00:00:00 2001
From: Ta-Ching Chen <contact@tachingchen.com>
Date: Sat, 12 Oct 2019 21:38:13 +0800
Subject: [PATCH] Fix release script wrongly tags image name & sed problem on
 Linux (#1353)

---
 hack/release-build.sh |  2 +-
 hack/release.sh       | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/hack/release-build.sh b/hack/release-build.sh
index 773bc38e..af1f45ee 100755
--- a/hack/release-build.sh
+++ b/hack/release-build.sh
@@ -162,7 +162,7 @@ build_env_builder_image() {
     else
         # variant specified - append variant to image name and assume dockerfile
         # exists with same suffix (e.g. image node-env-debian built from Dockerfile-debian)
-        imgname="$imgname-$imgvariant"
+        imgname="$imgnamebase-$imgvariant"
         dockerfile="Dockerfile-$imgvariant"
     fi
     echo "Building $envdir -> $imgname:$version using $dockerfile"
diff --git a/hack/release.sh b/hack/release.sh
index dc8d8b49..56aa7cf5 100755
--- a/hack/release.sh
+++ b/hack/release.sh
@@ -3,6 +3,8 @@
 set -e
 #set -x
 
+source $(realpath $(dirname $BASH_SOURCE)/../test/init_tools.sh)
+
 DIR=$(realpath $(dirname $0))/../
 BUILDDIR=$(realpath $DIR)/build
 
@@ -48,9 +50,9 @@ push_builder_image() {
 
 push_env_image() {
     local version=$1
-    envdir=$2
-    imgnamebase=$3
-    imgvariant=$4
+    local envdir=$2
+    local imgnamebase=$3
+    local imgvariant=$4
 
     if [ -z "$imgvariant" ]
     then 
@@ -59,7 +61,7 @@ push_env_image() {
     else 
         # variant specified - append variant to image name and assume dockerfile 
         # exists with same suffix (e.g. image node-env-debian built from Dockerfile-debian)
-        imgname="$imgname-$imgvariant"
+        imgname="$imgnamebase-$imgvariant"
     fi
     echo "Pushing $envdir -> $imgname:$version"
 
@@ -269,7 +271,7 @@ generate_changelog() {
 
     # generate changelog from github
     github_changelog_generator fission/fission -t ${GITHUB_TOKEN} --future-release ${version} --no-issues -o tmp_CHANGELOG.md
-    sed -i '' -e '$ d' tmp_CHANGELOG.md
+    sed -i '$ d' tmp_CHANGELOG.md
 
     # concatenate two files
     cat tmp_CHANGELOG.md >> new_CHANGELOG.md
@@ -335,7 +337,7 @@ docker build -t fission-release-builder -f $GOPATH/src/github.com/fission/fissio
 # Build all binaries & container images in docker
 # Here we mount docker.sock into container so that docker client can communicate with host docker daemon.
 # For more detail please visit https://docs.docker.com/machine/overview/
-docker run --rm -v $GOPATH/src:/go/src -v /var/run/docker.sock:/var/run/docker.sock \
+docker run --rm -it -v $GOPATH/src:/go/src -v /var/run/docker.sock:/var/run/docker.sock \
     -e VERSION=$version -w "/go/src/github.com/fission/fission/hack" fission-release-builder sh -c "./release-build.sh"
 
 push_all $version