Merge pull request #20720 from bparees/local

openshift-merge-robot · web-flow · commit e409e7dbd453 · 2018-08-21T18:36:07.000-07:00
always pull image before rebuilding local images
diff --git a/hack/build-local-images.py b/hack/build-local-images.py
@@ -257,6 +257,9 @@ def debug(message):
         )
 
     debug("Initiating Docker build with Dockerfile:\n{}".format(open(join(context_dir, "Dockerfile")).read()))
+    # re-pull the original image before building it so we're not accumulating layers each time we
+    # rebuild the image.
+    call(["docker", "pull", full_name(image) + ":" + image_config[image]["tag"]])
     call(["docker", "build", "-t", full_name(image), "."], cwd=context_dir)
 
     remove(join(context_dir, "Dockerfile"))

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,9 @@ def debug(message):`
`257`	`257`	`)`
`258`	`258`
`259`	`259`	`debug("Initiating Docker build with Dockerfile:\n{}".format(open(join(context_dir, "Dockerfile")).read()))`
	`260`	`+ # re-pull the original image before building it so we're not accumulating layers each time we`
	`261`	`+ # rebuild the image.`
	`262`	`+ call(["docker", "pull", full_name(image) + ":" + image_config[image]["tag"]])`
`260`	`263`	`call(["docker", "build", "-t", full_name(image), "."], cwd=context_dir)`
`261`	`264`
`262`	`265`	`remove(join(context_dir, "Dockerfile"))`