Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix release script wrongly tags image name & sed problem on Linux (#1353)

Browse Source
This commit is contained in:
Ta-Ching Chen
2019-10-12 21:38:13 +08:00
committed by GitHub
parent c930c69629
commit f30e7df43d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hack/release-build.sh
+1 -1
View File
@@ -162,7 +162,7 @@ build_env_builder_image() {
else else
# variant specified - append variant to image name and assume dockerfile # variant specified - append variant to image name and assume dockerfile
# exists with same suffix (e.g. image node-env-debian built from Dockerfile-debian) # exists with same suffix (e.g. image node-env-debian built from Dockerfile-debian)
imgname="$imgname-$imgvariant" imgname="$imgnamebase-$imgvariant"
dockerfile="Dockerfile-$imgvariant" dockerfile="Dockerfile-$imgvariant"
fi fi
echo "Building $envdir -> $imgname:$version using $dockerfile" echo "Building $envdir -> $imgname:$version using $dockerfile"
hack/release.sh
+8 -6
View File
@@ -3,6 +3,8 @@
set -e set -e
#set -x #set -x
source $(realpath $(dirname $BASH_SOURCE)/../test/init_tools.sh)
DIR=$(realpath $(dirname $0))/../ DIR=$(realpath $(dirname $0))/../
BUILDDIR=$(realpath $DIR)/build BUILDDIR=$(realpath $DIR)/build
@@ -48,9 +50,9 @@ push_builder_image() {
push_env_image() { push_env_image() {
local version=$1 local version=$1
envdir=$2 local envdir=$2
imgnamebase=$3 local imgnamebase=$3
imgvariant=$4 local imgvariant=$4
if [ -z "$imgvariant" ] if [ -z "$imgvariant" ]
then then
@@ -59,7 +61,7 @@ push_env_image() {
else else
# variant specified - append variant to image name and assume dockerfile # variant specified - append variant to image name and assume dockerfile
# exists with same suffix (e.g. image node-env-debian built from Dockerfile-debian) # exists with same suffix (e.g. image node-env-debian built from Dockerfile-debian)
imgname="$imgname-$imgvariant" imgname="$imgnamebase-$imgvariant"
fi fi
echo "Pushing $envdir -> $imgname:$version" echo "Pushing $envdir -> $imgname:$version"
@@ -269,7 +271,7 @@ generate_changelog() {
# generate changelog from github # generate changelog from github
github_changelog_generator fission/fission -t ${GITHUB_TOKEN} --future-release ${version} --no-issues -o tmp_CHANGELOG.md 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 # concatenate two files
cat tmp_CHANGELOG.md >> new_CHANGELOG.md 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 # Build all binaries & container images in docker
# Here we mount docker.sock into container so that docker client can communicate with host docker daemon. # 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/ # 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" -e VERSION=$version -w "/go/src/github.com/fission/fission/hack" fission-release-builder sh -c "./release-build.sh"
push_all $version push_all $version