fission/builder image, log collection improvement in builder (#397)
Create a container image with the buidler, so we can avoid copying the builder binary into the env container during the env container build. Gather both stdout and stderr of a build into the logs. * Add Dockerfile for builder + update release scripts * Improve logging of buildermgr and builder * Add support for environment-scoped buildcmd * Fix fork/exec wd when package is a file * Update tests to also include builder image * Add logging to builder's fork/exec
This commit is contained in:
committed by
Soam Vasani
parent
da820186f0
commit
b2678783b6
@@ -14,19 +14,22 @@ REPO=gcr.io/fission-ci
|
||||
IMAGE=$REPO/fission-bundle
|
||||
FETCHER_IMAGE=$REPO/fetcher
|
||||
FLUENTD_IMAGE=gcr.io/fission-ci/fluentd
|
||||
BUILDER_IMAGE=$REPO/builder
|
||||
TAG=test
|
||||
|
||||
dump_system_info
|
||||
|
||||
build_and_push_fission_bundle $IMAGE:$TAG
|
||||
|
||||
build_and_push_fetcher $FETCHER_IMAGE:$TAG
|
||||
|
||||
build_builder
|
||||
build_and_push_builder $BUILDER_IMAGE:$TAG
|
||||
|
||||
ENV='python'
|
||||
|
||||
build_and_push_env_runtime $ENV $REPO/$ENV-env:$TAG
|
||||
|
||||
build_and_push_env_builder $ENV $REPO/$ENV-env-builder:$TAG
|
||||
build_and_push_env_builder $ENV $REPO/$ENV-env-builder:$TAG $BUILDER_IMAGE:$TAG
|
||||
|
||||
build_and_push_fluentd $FLUENTD_IMAGE:$TAG
|
||||
|
||||
|
||||
+20
-4
@@ -50,9 +50,17 @@ build_and_push_fetcher() {
|
||||
popd
|
||||
}
|
||||
|
||||
build_builder() {
|
||||
|
||||
build_and_push_builder() {
|
||||
image_tag=$1
|
||||
|
||||
pushd $ROOT/builder/cmd
|
||||
./build.sh
|
||||
docker build -t $image_tag .
|
||||
|
||||
gcloud_login
|
||||
|
||||
gcloud docker -- push $image_tag
|
||||
popd
|
||||
}
|
||||
|
||||
@@ -85,12 +93,11 @@ build_and_push_env_runtime() {
|
||||
build_and_push_env_builder() {
|
||||
env=$1
|
||||
image_tag=$2
|
||||
builder_image=$3
|
||||
|
||||
pushd $ROOT/environments/$env/builder
|
||||
builderDir=${GOPATH}/src/github.com/fission/fission/builder/cmd
|
||||
cp ${builderDir}/builder .
|
||||
|
||||
docker build -t $image_tag .
|
||||
docker build -t $image_tag --build-arg BUILDER_IMAGE=${builder_image} .
|
||||
|
||||
gcloud_login
|
||||
|
||||
@@ -252,6 +259,15 @@ dump_all_fission_resources() {
|
||||
echo "--- End objects in the fission namespace $ns ---"
|
||||
}
|
||||
|
||||
dump_system_info() {
|
||||
echo "--- System Info ---"
|
||||
go version
|
||||
docker version
|
||||
kubectl version
|
||||
helm version
|
||||
echo "--- End System Info ---"
|
||||
}
|
||||
|
||||
dump_logs() {
|
||||
id=$1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user