File size: 1,251 Bytes
8247f19 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | diff --git a/CHANGES.rst b/CHANGES.rst
index 87033da6..70dbab9d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -20,6 +20,8 @@ Unreleased
(:issue:`1510`)
- The debugger detects cycles in chained exceptions and does not time
out in that case. (:issue:`1536`)
+- When running the development server in Docker, the debugger security
+ pin is now unique per container.
Version 0.15.2
diff --git a/src/werkzeug/debug/__init__.py b/src/werkzeug/debug/__init__.py
index c5e4d2d5..9195c79a 100644
--- a/src/werkzeug/debug/__init__.py
+++ b/src/werkzeug/debug/__init__.py
@@ -67,6 +67,19 @@ def get_machine_id():
return rv
def _generate():
+ # docker containers share the same machine id, get the
+ # container id instead
+ try:
+ with open("/proc/self/cgroup") as f:
+ value = f.readline()
+ except IOError:
+ pass
+ else:
+ value = value.strip().partition("/docker/")[2]
+
+ if value:
+ return value
+
# Potential sources of secret information on linux. The machine-id
# is stable across boots, the boot id is not
for filename in "/etc/machine-id", "/proc/sys/kernel/random/boot_id":
|