Skip to content

Commit 9875602

Browse files
committed
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 <james.lecuirot@metaswitch.com>
1 parent 2be550f commit 9875602

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ version number is tracked in the file `VERSION`.
99
## Unreleased
1010
### Changed
1111
- Small tidyups of environment collection module - PATCH
12+
- Have dind use host's /etc/docker to ensure networks use safe subnets - MINOR
1213
### Added
1314
- Forward host working directory as `FLOKI_HOST_WORKDIR` - MINOR
1415

src/dind.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ impl Dind {
3737
"--name",
3838
&self.name,
3939
"-v",
40+
"/etc/docker:/etc/docker:ro",
41+
"-v",
4042
&format!("{}:{}", self.mount_source, self.mount_target),
4143
"-d",
4244
"docker:stable-dind",

0 commit comments

Comments
 (0)