diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-09 16:55:29 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-09 16:55:29 -0700 |
| commit | 8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994 (patch) | |
| tree | b94d99ad1a1cd15a7c636b2453b293bb0b095789 /kokoro/linux/build_and_run_docker.sh | |
| parent | a4862e790ec34a902b322e22e92acc049b63941d (diff) | |
| parent | fe80059c8d5d78f73b9b3bd0f6276c7b05a3f574 (diff) | |
| download | protobuf-integration_base.tar.gz protobuf-integration_base.tar.bz2 protobuf-integration_base.zip | |
Merge remote-tracking branch 'google/master' into integration_baseintegration_base
Diffstat (limited to 'kokoro/linux/build_and_run_docker.sh')
| -rwxr-xr-x | kokoro/linux/build_and_run_docker.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/kokoro/linux/build_and_run_docker.sh b/kokoro/linux/build_and_run_docker.sh index f9c60710..b81a3684 100755 --- a/kokoro/linux/build_and_run_docker.sh +++ b/kokoro/linux/build_and_run_docker.sh @@ -8,7 +8,6 @@ # OUTPUT_DIR - Directory that will be copied from inside docker after finishing. # $@ - Extra args to pass to docker run - set -ex cd $(dirname $0)/../.. @@ -39,7 +38,6 @@ docker run \ -e KOKORO_BUILD_ID=$KOKORO_BUILD_ID \ -e EXTERNAL_GIT_ROOT="/var/local/kokoro/protobuf" \ -e TEST_SET="$TEST_SET" \ - -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ -v "$git_root:/var/local/kokoro/protobuf:ro" \ -v $CCACHE_DIR:$CCACHE_DIR \ -w /var/local/git/protobuf \ @@ -47,16 +45,9 @@ docker run \ $DOCKER_IMAGE_NAME \ bash -l "/var/local/kokoro/protobuf/$DOCKER_RUN_SCRIPT" || FAILED="true" -# Copy output artifacts -if [ "$OUTPUT_DIR" != "" ] -then - docker cp "$CONTAINER_NAME:/var/local/git/protobuf/$OUTPUT_DIR" "${git_root}/kokoro" || FAILED="true" -fi - # remove the container, possibly killing it first docker rm -f $CONTAINER_NAME || true -if [ "$FAILED" != "" ] -then +[ -z "$FAILED" ] || { exit 1 -fi +} |