BryanDavis has submitted this change and it was merged. Change subject: build: Allow disregarding cache when building docker images ......................................................................
build: Allow disregarding cache when building docker images Useful when you want a full rebuild, including the apt-get update parts. Change-Id: Ibdb0fe30d59e5e97c6c1e7d96f15dfc5823c368c --- M build.py 1 file changed, 14 insertions(+), 7 deletions(-) Approvals: BryanDavis: Verified; Looks good to me, approved diff --git a/build.py b/build.py index 54d84d7..73a541d 100755 --- a/build.py +++ b/build.py @@ -53,15 +53,17 @@ os.unlink(os.path.join(BASE_PATH, name, 'Dockerfile')) -def build_image(name, registry, image_prefix): +def build_image(name, registry, image_prefix, no_cache): make_dockerfile(name, registry, image_prefix) - subprocess.check_call([ + args = [ DOCKER_BINARY, 'build', - '-t', - make_docker_tag(name, registry, image_prefix), - os.path.join(BASE_PATH, name) - ]) + '-t', make_docker_tag(name, registry, image_prefix), + ] + if no_cache: + args.append('--no-cache') + args.append(os.path.join(BASE_PATH, name)) + subprocess.check_call(args) rm_dockerfile(name) @@ -125,6 +127,11 @@ default='toollabs', help='Prefix to use for each image name to make sure they are easily differntiable', ) + argparser.add_argument( + '--no-cache', + action='store_true', + help="Do not use docker's cache when building images, build from scratch" + ) args = argparser.parse_args() images = lineage_of(args.image) @@ -133,7 +140,7 @@ # Separate build and push step so we do not push images if # any of them fail for image in images: - build_image(image, args.docker_registry, args.image_prefix) + build_image(image, args.docker_registry, args.image_prefix, args.no_cache) if args.push: for image in images: -- To view, visit https://gerrit.wikimedia.org/r/291980 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdb0fe30d59e5e97c6c1e7d96f15dfc5823c368c Gerrit-PatchSet: 2 Gerrit-Project: operations/docker-images/toollabs-images Gerrit-Branch: master Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits