Skip to content

Commit

Permalink
Have dind use host's /etc/docker to ensure networks use safe subnets
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
chewi committed Aug 6, 2019
1 parent 2be550f commit c757fec
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions src/dind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit c757fec

Please sign in to comment.