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

Fix release script tagging wrong image name (#1257)

Browse Source
This commit is contained in:
Ta-Ching Chen
2019-07-30 14:51:25 +05:30
committed by Vishal
parent 3b47daa8fc
commit ac21c037d6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hack/release-build.sh
+6 -6
View File
@@ -87,19 +87,19 @@ build_builder_image() {
build_env_image() { build_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
# no variant specified, just use the base name # no variant specified, just use the base name
imgname=$imgnamebase imgname=$imgnamebase
dockerfile="Dockerfile" dockerfile="Dockerfile"
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
+4 -4
View File
@@ -90,9 +90,9 @@ push_all_envs() {
push_env_builder_image() { push_env_builder_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
@@ -101,7 +101,7 @@ push_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"
fi fi
echo "Pushing $envdir -> $imgname:$version" echo "Pushing $envdir -> $imgname:$version"