Release 1.11.1 (#1838)
Release 1.11.1 along with some changes to release script
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
FROM golang:1.12.13
|
||||
ENV GO111MODULE on
|
||||
RUN mkdir -p /go/src/github.com/fission
|
||||
RUN wget -qO- https://download.docker.com/linux/static/stable/x86_64/docker-17.03.0-ce.tgz | tar xvz -C /usr/local/bin/ --strip 1
|
||||
RUN wget -qO- https://get.helm.sh/helm-v3.3.0-linux-amd64.tar.gz | tar xvz -C /usr/local/bin/ --strip 1
|
||||
|
||||
@@ -85,35 +85,6 @@ build_builder_image() {
|
||||
docker tag $tag fission/builder:latest
|
||||
}
|
||||
|
||||
build_env_image() {
|
||||
local version=$1
|
||||
local envdir=$2
|
||||
local imgnamebase=$3
|
||||
local imgvariant=$4
|
||||
|
||||
if [ -z "$imgvariant" ]
|
||||
then
|
||||
# no variant specified, just use the base name
|
||||
imgname=$imgnamebase
|
||||
dockerfile="Dockerfile"
|
||||
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="$imgnamebase-$imgvariant"
|
||||
dockerfile="Dockerfile-$imgvariant"
|
||||
fi
|
||||
echo "Building $envdir -> $imgname:$version using $dockerfile"
|
||||
|
||||
pushd $DIR/environments/$envdir
|
||||
if [ -f build.sh ]
|
||||
then
|
||||
./build.sh
|
||||
fi
|
||||
docker build -t fission/$imgname:$version -f $dockerfile .
|
||||
docker tag fission/$imgname:$version fission/$imgname:latest
|
||||
popd
|
||||
}
|
||||
|
||||
# Build pre-upgrade-checks image
|
||||
build_pre_upgrade_checks_image() {
|
||||
local version=$1
|
||||
@@ -127,77 +98,6 @@ build_pre_upgrade_checks_image() {
|
||||
docker tag $tag fission/pre-upgrade-checks:latest
|
||||
}
|
||||
|
||||
build_all_envs() {
|
||||
local version=$1
|
||||
|
||||
# call with version, env dir, image name base, image name variant
|
||||
build_env_image "$version" "nodejs" "node-env" ""
|
||||
build_env_image "$version" "nodejs" "node-env" "debian"
|
||||
build_env_image "$version" "nodejs" "node-env" "12.16"
|
||||
build_env_image "$version" "binary" "binary-env" ""
|
||||
build_env_image "$version" "dotnet" "dotnet-env" ""
|
||||
build_env_image "$version" "dotnet20" "dotnet20-env" ""
|
||||
build_env_image "$version" "go" "go-env" ""
|
||||
build_env_image "$version" "go" "go-env" "1.11.4"
|
||||
build_env_image "$version" "go" "go-env" "1.12"
|
||||
build_env_image "$version" "go" "go-env" "1.13"
|
||||
build_env_image "$version" "go" "go-env" "1.14"
|
||||
build_env_image "$version" "perl" "perl-env" ""
|
||||
build_env_image "$version" "php7" "php-env" ""
|
||||
build_env_image "$version" "python" "python-env" ""
|
||||
build_env_image "$version" "python" "python-env" "2.7"
|
||||
build_env_image "$version" "ruby" "ruby-env" ""
|
||||
build_env_image "$version" "jvm" "jvm-env" ""
|
||||
build_env_image "$version" "jvm-jersey" "jvm-jersey-env" ""
|
||||
build_env_image "$version" "jvm-jersey" "jvm-jersey-env" "11"
|
||||
build_env_image "$version" "tensorflow-serving" "tensorflow-serving-env" ""
|
||||
}
|
||||
|
||||
build_env_builder_image() {
|
||||
local version=$1
|
||||
envdir=$2
|
||||
imgnamebase=$3
|
||||
imgvariant=$4
|
||||
|
||||
if [ -z "$imgvariant" ]
|
||||
then
|
||||
# no variant specified, just use the base name
|
||||
imgname=$imgnamebase
|
||||
dockerfile="Dockerfile"
|
||||
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="$imgnamebase-$imgvariant"
|
||||
dockerfile="Dockerfile-$imgvariant"
|
||||
fi
|
||||
echo "Building $envdir -> $imgname:$version using $dockerfile"
|
||||
|
||||
pushd $DIR/environments/$envdir/builder
|
||||
docker build -t fission/$imgname:$version -f $dockerfile .
|
||||
docker tag fission/$imgname:$version fission/$imgname:latest
|
||||
popd
|
||||
}
|
||||
|
||||
build_all_env_builders() {
|
||||
local version=$1
|
||||
|
||||
# call with version, env dir, image name base, image name variant
|
||||
build_env_builder_image "$version" "python" "python-builder" ""
|
||||
build_env_builder_image "$version" "binary" "binary-builder" ""
|
||||
build_env_builder_image "$version" "go" "go-builder" ""
|
||||
build_env_builder_image "$version" "go" "go-builder" "1.11.4"
|
||||
build_env_builder_image "$version" "go" "go-builder" "1.12"
|
||||
build_env_builder_image "$version" "go" "go-builder" "1.13"
|
||||
build_env_builder_image "$version" "go" "go-builder" "1.14"
|
||||
build_env_builder_image "$version" "jvm" "jvm-builder" ""
|
||||
build_env_builder_image "$version" "jvm-jersey" "jvm-jersey-builder" ""
|
||||
build_env_builder_image "$version" "jvm-jersey" "jvm-jersey-builder" "11"
|
||||
build_env_builder_image "$version" "nodejs" "node-builder" ""
|
||||
build_env_builder_image "$version" "php7" "php-builder" ""
|
||||
build_env_builder_image "$version" "ruby" "ruby-builder" ""
|
||||
build_env_builder_image "$version" "dotnet20" "dotnet20-builder" ""
|
||||
}
|
||||
|
||||
build_charts() {
|
||||
local version=$1
|
||||
mkdir -p $BUILDDIR/charts
|
||||
@@ -301,7 +201,5 @@ date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
|
||||
gitcommit=$(git rev-parse HEAD)
|
||||
|
||||
build_all $version $date $gitcommit
|
||||
build_all_envs $version
|
||||
build_all_env_builders $version
|
||||
build_charts $version
|
||||
build_yamls $version
|
||||
|
||||
+8
-91
@@ -48,93 +48,6 @@ push_builder_image() {
|
||||
docker push $tag
|
||||
}
|
||||
|
||||
push_env_image() {
|
||||
local version=$1
|
||||
local envdir=$2
|
||||
local imgnamebase=$3
|
||||
local imgvariant=$4
|
||||
|
||||
if [ -z "$imgvariant" ]
|
||||
then
|
||||
# no variant specified, just use the base name
|
||||
imgname=$imgnamebase
|
||||
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="$imgnamebase-$imgvariant"
|
||||
fi
|
||||
echo "Pushing $envdir -> $imgname:$version"
|
||||
|
||||
docker push fission/$imgname:$version
|
||||
docker push fission/$imgname:latest
|
||||
}
|
||||
|
||||
push_all_envs() {
|
||||
local version=$1
|
||||
|
||||
# call with version, env dir, image name base, image name variant
|
||||
push_env_image "$version" "nodejs" "node-env" ""
|
||||
push_env_image "$version" "nodejs" "node-env" "debian"
|
||||
push_env_image "$version" "binary" "binary-env" ""
|
||||
push_env_image "$version" "dotnet" "dotnet-env" ""
|
||||
push_env_image "$version" "dotnet20" "dotnet20-env" ""
|
||||
push_env_image "$version" "go" "go-env" ""
|
||||
push_env_image "$version" "go" "go-env" "1.11.4"
|
||||
push_env_image "$version" "go" "go-env" "1.12"
|
||||
push_env_image "$version" "go" "go-env" "1.13"
|
||||
push_env_image "$version" "go" "go-env" "1.14"
|
||||
push_env_image "$version" "perl" "perl-env" ""
|
||||
push_env_image "$version" "php7" "php-env" ""
|
||||
push_env_image "$version" "python" "python-env" ""
|
||||
push_env_image "$version" "python" "python-env" "2.7"
|
||||
push_env_image "$version" "ruby" "ruby-env" ""
|
||||
push_env_image "$version" "jvm" "jvm-env" ""
|
||||
push_env_image "$version" "jvm-jersey" "jvm-jersey-env" ""
|
||||
push_env_image "$version" "jvm-jersey" "jvm-jersey-env" "11"
|
||||
push_env_image "$version" "tensorflow-serving" "tensorflow-serving-env" ""
|
||||
}
|
||||
|
||||
push_env_builder_image() {
|
||||
local version=$1
|
||||
local envdir=$2
|
||||
local imgnamebase=$3
|
||||
local imgvariant=$4
|
||||
|
||||
if [ -z "$imgvariant" ]
|
||||
then
|
||||
# no variant specified, just use the base name
|
||||
imgname=$imgnamebase
|
||||
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="$imgnamebase-$imgvariant"
|
||||
fi
|
||||
echo "Pushing $envdir -> $imgname:$version"
|
||||
|
||||
docker push fission/$imgname:$version
|
||||
docker push fission/$imgname:latest
|
||||
}
|
||||
|
||||
push_all_env_builders() {
|
||||
local version=$1
|
||||
|
||||
# call with version, env dir, image name base, image name variant
|
||||
push_env_builder_image "$version" "python" "python-builder" ""
|
||||
push_env_builder_image "$version" "binary" "binary-builder" ""
|
||||
push_env_builder_image "$version" "go" "go-builder" ""
|
||||
push_env_builder_image "$version" "go" "go-builder" "1.11.4"
|
||||
push_env_builder_image "$version" "go" "go-builder" "1.12"
|
||||
push_env_builder_image "$version" "go" "go-builder" "1.13"
|
||||
push_env_builder_image "$version" "go" "go-builder" "1.14"
|
||||
push_env_builder_image "$version" "jvm" "jvm-builder" ""
|
||||
push_env_builder_image "$version" "jvm-jersey" "jvm-jersey-builder" ""
|
||||
push_env_builder_image "$version" "jvm-jersey" "jvm-jersey-builder" "11"
|
||||
push_env_builder_image "$version" "nodejs" "node-builder" ""
|
||||
push_env_builder_image "$version" "ruby" "ruby-builder" ""
|
||||
push_env_builder_image "$version" "dotnet20" "dotnet20-builder" ""
|
||||
push_env_builder_image "$version" "php7" "php-builder" ""
|
||||
}
|
||||
|
||||
# Push pre-upgrade-checks image
|
||||
push_pre_upgrade_checks_image() {
|
||||
local version=$1
|
||||
@@ -343,6 +256,12 @@ release_environment_check() {
|
||||
echo "Error finding chart repo at $GOPATH/src/github.com/fission/fission-charts"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d $FISSION_HOME ]
|
||||
then
|
||||
echo "The FISSION_HOME variable should be set to directory where Fission and fission-charts are checked out"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
export GITHUB_TOKEN=$(cat ~/.gh-access-token)
|
||||
@@ -358,17 +277,15 @@ fi
|
||||
release_environment_check $version $chartsrepo
|
||||
|
||||
# Build release-builder image
|
||||
docker build -t fission-release-builder -f $GOPATH/src/github.com/fission/fission/hack/Dockerfile .
|
||||
#docker build -t fission-release-builder -f $FISSION_HOME/fission/hack/Dockerfile .
|
||||
|
||||
# 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 -it -v $GOPATH/src:/go/src -v /var/run/docker.sock:/var/run/docker.sock \
|
||||
docker run --rm -it -v $FISSION_HOME:/go/src/github.com/fission -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
|
||||
push_all_envs $version
|
||||
push_all_env_builders $version
|
||||
|
||||
tag_and_release $version
|
||||
attach_github_release_cli $version
|
||||
|
||||
Reference in New Issue
Block a user