Fix issue # 171 with nested ENV variables in Dockerfile

Marcus Linke · Marcus Linke · commit d57bed76f52d · 2015-03-20T21:48:24.000+01:00
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -38,11 +38,11 @@ protected String filterForEnvironmentVars(Map<String, String> environmentMap,
 
         // handle: $VARIABLE case
         currentResourceContent = currentResourceContent.replaceAll(
-            "\\$" + variable, replacementValue);
+            "\\$" + variable, Matcher.quoteReplacement(replacementValue));
 
         // handle ${VARIABLE} case
         currentResourceContent = currentResourceContent.replaceAll(
-            "\\$\\{" + variable + "\\}", replacementValue);
+            "\\$\\{" + variable + "\\}", Matcher.quoteReplacement(replacementValue));
 
       }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -111,6 +111,15 @@ public void testDockerBuilderAddFolder() throws DockerException,
 		String response = dockerfileBuild(baseDir);
 		assertThat(response, containsString("Successfully executed testAddFolder.sh"));
 	}
+	
+	@Test
+	public void testDockerBuilderEnv() throws DockerException,
+			IOException {
+		File baseDir = new File(Thread.currentThread().getContextClassLoader()
+				.getResource("testEnv").getFile());
+		String response = dockerfileBuild(baseDir);
+		assertThat(response, containsString("Successfully executed testrun.sh"));
+	}
 
 
 	private String dockerfileBuild(File baseDir) {
diff --git a/src/test/resources/testEnv/Dockerfile b/src/test/resources/testEnv/Dockerfile
@@ -0,0 +1,10 @@
+FROM      ubuntu:latest
+
+ENV varA ./subFolder
+ENV varB $varA/testrun.sh 
+
+ADD	$varB       /tmp/
+
+RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
+
+CMD ["testrun.sh"]
diff --git a/src/test/resources/testEnv/subFolder/testrun.sh b/src/test/resources/testEnv/subFolder/testrun.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Successfully executed testrun.sh"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/sh`
	`2`	`+`
	`3`	`+echo "Successfully executed testrun.sh"`