diff options
| author | Jiayu Liu <jiayu@hey.com> | 2022-04-22 11:37:03 +0800 |
|---|---|---|
| committer | Jens Geyer <Jens-G@users.noreply.github.com> | 2022-04-27 12:49:55 +0200 |
| commit | 40496a7c432d0a39df8ff180e9cb0e0a94af9b44 (patch) | |
| tree | 9581eb6c71e1c250048105831be16eda3608dfeb /build | |
| parent | 9042cc298c6d02d88a44b125a1ebaabb9416cd04 (diff) | |
| download | thrift-40496a7c432d0a39df8ff180e9cb0e0a94af9b44.tar.gz | |
use 45 min timeout
Diffstat (limited to 'build')
| -rwxr-xr-x | build/docker/refresh.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/build/docker/refresh.sh b/build/docker/refresh.sh index c9330b5eb..08cbc91e1 100755 --- a/build/docker/refresh.sh +++ b/build/docker/refresh.sh @@ -43,7 +43,7 @@ function dockerfile_changed { # # If this build has no DOCKER_PASS and it is in the docker stage # then there's no reason to do any processing because we cannot -# push the result if the Dockerfile changed. +# push the result if the Dockerfile changed. # if [[ "$TRAVIS_BUILD_STAGE" == "docker" ]] && [[ -z "$DOCKER_PASS" ]]; then @@ -70,13 +70,9 @@ popd # echo Rebuilding docker image $DISTRO +docker build --tag $DOCKER_TAG build/docker/$DISTRO -# https://docs.travis-ci.com/user/common-build-problems/#build-times-out-because-no-output-was-received -# adding `travis_wait` because kerl building in the docker file takes >10 min for building erlang -# without printing to stdout, resulting in build failures -travis_wait 45 docker build --tag $DOCKER_TAG build/docker/$DISTRO - -if [[ "$TRAVIS_BUILD_STAGE" == "docker" ]] && [[ ! -z "$DOCKER_USER" ]] && [[ ! -z "$DOCKER_PASS" ]]; then +if [[ "$TRAVIS_BUILD_STAGE" == "docker" ]] && [[ ! -z "$DOCKER_USER" ]] && [[ ! -z "$DOCKER_PASS" ]]; then echo Pushing docker image $DOCKER_TAG docker login -u $DOCKER_USER -p $DOCKER_PASS docker push $DOCKER_TAG |