Fix bug in new add_docker_switch behaviour.

maxdymond · maxdymond · commit 000b622c20e3 · 2020-07-16T09:38:57.000+01:00
Fixes #108 Signed-off-by: Max Dymond <max.dymond@metaswitch.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ Status: Available for use
 ### Added
 
 ### Fixed
+- Fixed bug in new `add_docker_switch` behaviour.
 
 ## [0.6.0] - 2020-07-15
 
diff --git a/src/command.rs b/src/command.rs
@@ -192,6 +192,7 @@ pub fn enable_docker_in_docker(
     dind: &crate::dind::Dind,
 ) -> Result<DockerCommandBuilder, Error> {
     Ok(command
-        .add_docker_switch(&format!("--link {}:floki-docker", dind.name()))
+        .add_docker_switch("--link")
+        .add_docker_switch(&format!("{}:floki-docker", dind.name()))
         .add_environment("DOCKER_HOST", "tcp://floki-docker:2375"))
 }

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,7 @@ pub fn enable_docker_in_docker(`
`192`	`192`	`dind: &crate::dind::Dind,`
`193`	`193`	`) -> Result<DockerCommandBuilder, Error> {`
`194`	`194`	`Ok(command`
`195`		`- .add_docker_switch(&format!("--link {}:floki-docker", dind.name()))`
	`195`	`+ .add_docker_switch("--link")`
	`196`	`+ .add_docker_switch(&format!("{}:floki-docker", dind.name()))`
`196`	`197`	`.add_environment("DOCKER_HOST", "tcp://floki-docker:2375"))`
`197`	`198`	`}`