Add separate properties for build.env.build and run.env

Addresses fabric8io#386. Note that it was not possible to use "env.run/build", which would have matched well with other properties, because we already have the "env" matcher (which would have matched env.run too, injecting bad properties).
stromnet · Feb 12, 2018 · 7263026 · 7263026
1 parent 90977d2
commit 7263026
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 2 deletions.
diff --git a/src/main/java/io/fabric8/maven/docker/config/handler/property/ConfigKey.java b/src/main/java/io/fabric8/maven/docker/config/handler/property/ConfigKey.java
@@ -53,6 +53,8 @@ public enum ConfigKey {
     ENTRYPOINT,
     ENV,
     ENV_PROPERTY_FILE,
+    ENV_BUILD("buildEnv"),
+    ENV_RUN("runEnv"),
     EXPOSED_PROPERTY_KEY,
     EXTRA_HOSTS,
     FILTER,

diff --git a/src/main/java/io/fabric8/maven/docker/config/handler/property/PropertyConfigHandler.java b/src/main/java/io/fabric8/maven/docker/config/handler/property/PropertyConfigHandler.java
@@ -24,6 +24,7 @@
 import io.fabric8.maven.docker.config.handler.ExternalConfigHandler;
 import io.fabric8.maven.docker.util.EnvUtil;
 
+import org.codehaus.plexus.util.CollectionUtils;
 import static io.fabric8.maven.docker.config.handler.property.ConfigKey.*;
 import static io.fabric8.maven.docker.util.EnvUtil.*;
 
@@ -84,7 +85,10 @@ private BuildImageConfiguration extractBuildConfiguration(String prefix, Propert
                 .optimise(withPrefix(prefix, OPTIMISE, properties))
                 .entryPoint(withPrefix(prefix, ENTRYPOINT, properties))
                 .assembly(extractAssembly(prefix, properties))
-                .env(mapWithPrefix(prefix, ENV, properties))
+                .env(CollectionUtils.mergeMaps(
+                        mapWithPrefix(prefix, ENV_BUILD, properties),
+                        mapWithPrefix(prefix, ENV, properties)
+                ))
                 .args(mapWithPrefix(prefix, ARGS, properties))
                 .labels(mapWithPrefix(prefix,LABELS,properties))
                 .ports(extractPortValues(prefix, properties))
@@ -122,7 +126,10 @@ private RunImageConfiguration extractRunConfiguration(String prefix, Properties
                 .dnsSearch(listWithPrefix(prefix, DNS_SEARCH, properties))
                 .domainname(withPrefix(prefix, DOMAINNAME, properties))
                 .entrypoint(withPrefix(prefix, ENTRYPOINT, properties))
-                .env(mapWithPrefix(prefix, ENV, properties))
+                .env(CollectionUtils.mergeMaps(
+                        mapWithPrefix(prefix, ENV_RUN, properties),
+                        mapWithPrefix(prefix, ENV, properties)
+                ))
                 .labels(mapWithPrefix(prefix,LABELS,properties))
                 .envPropertyFile(withPrefix(prefix, ENV_PROPERTY_FILE, properties))
                 .extraHosts(listWithPrefix(prefix, EXTRA_HOSTS, properties))

diff --git a/src/test/java/io/fabric8/maven/docker/config/handler/property/PropertyConfigHandlerTest.java b/src/test/java/io/fabric8/maven/docker/config/handler/property/PropertyConfigHandlerTest.java
@@ -146,6 +146,57 @@ public void testEnvAndLabels() throws Exception {
         }
     }
 
+
+    @Test
+    public void testSpecificEnv() throws Exception {
+        List<ImageConfiguration> configs = resolveImage(
+                imageConfiguration,props(
+                        "docker.from", "baase",
+                        "docker.name","demo",
+                        "docker.buildEnv.HOME", "/tmp",
+                        "docker.runEnv.root.dir", "/bla"
+                ));
+
+        assertEquals(1,configs.size());
+        ImageConfiguration calcConfig = configs.get(0);
+
+        Map<String, String> env;
+
+        env = calcConfig.getBuildConfiguration().getEnv();
+        assertEquals(1,env.size());
+        assertEquals("/tmp",env.get("HOME"));
+
+        env = calcConfig.getRunConfiguration().getEnv();
+        assertEquals(1,env.size());
+        assertEquals("/bla",env.get("root.dir"));
+    }
+
+    @Test
+    public void testMergedEnv() throws Exception {
+        List<ImageConfiguration> configs = resolveImage(
+                imageConfiguration,props(
+                        "docker.from", "baase",
+                        "docker.name","demo",
+                        "docker.env.HOME", "/tmp",
+                        "docker.buildEnv.HOME", "/var/tmp",
+                        "docker.runEnv.root.dir", "/bla"
+                ));
+
+        assertEquals(1,configs.size());
+        ImageConfiguration calcConfig = configs.get(0);
+
+        Map<String, String> env;
+
+        env = calcConfig.getBuildConfiguration().getEnv();
+        assertEquals(1,env.size());
+        assertEquals("/var/tmp",env.get("HOME"));
+
+        env = calcConfig.getRunConfiguration().getEnv();
+        assertEquals(2,env.size());
+        assertEquals("/tmp",env.get("HOME"));
+        assertEquals("/bla",env.get("root.dir"));
+    }
+
     @Test
     public void testAssembly() throws Exception {
         List<ImageConfiguration> configs = resolveImage(imageConfiguration, props(getTestAssemblyData()));