This is an automated email from the ASF dual-hosted git repository. marcoabreu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push: new bbee33a Increase docker-compose http timeout (#18202) bbee33a is described below commit bbee33a45a19fcaa577010c63dbb3d7562791947 Author: Leonard Lausen <lau...@amazon.com> AuthorDate: Fri May 1 15:13:19 2020 -0700 Increase docker-compose http timeout (#18202) * Increase docker-compose http timeout * Use load_docker_cache for docker-compose containers as well The cache_from directive in docker-compose.yml does not trigger automatic download of the image. At least not with the "legacy" docker build; it may work automatically once enabling buildkit feature. Until then, manually initialize the cache from dockerhub. --- ci/Jenkinsfile_docker_cache | 2 +- ci/build.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/Jenkinsfile_docker_cache b/ci/Jenkinsfile_docker_cache index 5e423f1..2bf9040 100644 --- a/ci/Jenkinsfile_docker_cache +++ b/ci/Jenkinsfile_docker_cache @@ -38,7 +38,7 @@ core_logic: { timeout(time: total_timeout, unit: 'MINUTES') { utils.init_git() sh "python3 ./ci/docker_cache.py --docker-registry ${env.DOCKER_CACHE_REGISTRY}" - sh "cd ci && python3 ./docker_login.py --secret-name ${env.DOCKERHUB_SECRET_NAME} && docker-compose -f docker/docker-compose.yml build --parallel && docker-compose -f docker/docker-compose.yml push && docker logout" + sh "cd ci && python3 ./docker_login.py --secret-name ${env.DOCKERHUB_SECRET_NAME} && docker-compose -f docker/docker-compose.yml build --parallel && COMPOSE_HTTP_TIMEOUT=600 docker-compose -f docker/docker-compose.yml push && docker logout" } } } diff --git a/ci/build.py b/ci/build.py index 3936773..0f23c35 100755 --- a/ci/build.py +++ b/ci/build.py @@ -391,8 +391,7 @@ def main() -> int: elif args.platform: platform = args.platform tag = get_docker_tag(platform=platform, registry=args.docker_registry) - if args.docker_registry and platform not in DOCKER_COMPOSE_WHITELIST: - # Caching logic for Dockerfiles not yet refactored with compose + if args.docker_registry: load_docker_cache(tag=tag, docker_registry=args.docker_registry) if not args.run_only: build_docker(platform=platform, registry=args.docker_registry, num_retries=args.docker_build_retries,