aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-30 08:36:53 +0000
committerGerrit Code Review <review@openstack.org>2017-06-30 08:36:53 +0000
commit876bafb8e91582a4fed83514d9db0cfc3bc756d1 (patch)
tree3931c4293507bfb6e2c4bae880e94cf60113b508
parent35e1411c8c8d4aa1261dab0fc31c6c1d32a33bfc (diff)
parentf739fd0ccfb878e88672feb3fb4eb3a575461604 (diff)
Merge "Force mtime for tar used in container config md5sums"
-rwxr-xr-xdocker/docker-puppet.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 430aa88b..4c193e49 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -221,7 +221,7 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
# Write a checksum of the config-data dir, this is used as a
# salt to trigger container restart when the config changes
- tar cf - /var/lib/config-data/${NAME} | md5sum | awk '{print $1}' > /var/lib/config-data/${NAME}.md5sum
+ tar -c -f - /var/lib/config-data/${NAME} --mtime='1970-01-01' | md5sum | awk '{print $1}' > /var/lib/config-data/${NAME}.md5sum
fi
""")