From 29178a1df45cc42a1fbf006336f2751561075f62 Mon Sep 17 00:00:00 2001 From: alesapin Date: Wed, 1 Jul 2020 21:51:11 +0300 Subject: [PATCH] Don't download image twice --- docker/packager/packager | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/packager/packager b/docker/packager/packager index fb076d17b50..c3e0778e10a 100755 --- a/docker/packager/packager +++ b/docker/packager/packager @@ -213,9 +213,10 @@ if __name__ == "__main__": logging.info("Should place {} to output".format(args.with_binaries)) dockerfile = os.path.join(ch_root, "docker/packager", image_type, "Dockerfile") + image_with_version = image_name + ":" + args.docker_image_version if image_type != "freebsd" and not check_image_exists_locally(image_name) or args.force_build_image: - if not pull_image(image_name) or args.force_build_image: - build_image(image_name, dockerfile) + if not pull_image(image_with_version) or args.force_build_image: + build_image(image_with_version, dockerfile) env_prepared = parse_env_variables( args.build_type, args.compiler, args.sanitizer, args.package_type, image_type, args.cache, args.distcc_hosts, args.unbundled, args.split_binary, args.clang_tidy,