From 28b908abfc09aabc4c3cc2dd48152c5b8d2bb0d3 Mon Sep 17 00:00:00 2001 From: Ian Main Date: Wed, 25 Jan 2017 21:08:53 -0500 Subject: [PATCH] Add option to diff containers after config stage. This allows you to show the changes made to a container during configuration stage for fast development. Change-Id: Id9c72cf2b07486f0a80bf3572a7ba349888d877f --- docker/docker-puppet.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index 1bb8bc2bfc..86c8ec98ac 100755 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -46,6 +46,15 @@ def pull_image(name): def rm_container(name): + if os.environ.get('SHOW_DIFF', None): + print('Diffing container: %s' % name) + subproc = subprocess.Popen(['/usr/bin/docker', 'diff', name], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + cmd_stdout, cmd_stderr = subproc.communicate() + print(cmd_stdout) + print(cmd_stderr) + print('Removing container: %s' % name) subproc = subprocess.Popen(['/usr/bin/docker', 'rm', name], stdout=subprocess.PIPE,