Have dind use host's /etc/docker to ensure networks use safe subnets

You may have configured Docker to avoid subnets used by your internal infrastructure but we need to ensure that networks created by docker-compose inside dind also respect this. Signed-off-by: James Le Cuirot <[email protected]>
Metaswitch · Aug 6, 2019 · 9875602 · 9875602
1 parent 2be550f
commit 9875602
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ version number is tracked in the file `VERSION`.
 ## Unreleased
 ### Changed
 - Small tidyups of environment collection module - PATCH
+- Have dind use host's /etc/docker to ensure networks use safe subnets - MINOR
 ### Added
 - Forward host working directory as `FLOKI_HOST_WORKDIR` - MINOR
 

diff --git a/src/dind.rs b/src/dind.rs
@@ -37,6 +37,8 @@ impl Dind {
                 "--name",
                 &self.name,
                 "-v",
+                "/etc/docker:/etc/docker:ro",
+                "-v",
                 &format!("{}:{}", self.mount_source, self.mount_target),
                 "-d",
                 "docker:stable-dind",