Merge pull request #810 from chonton/master

Allow comma separated list of container names in dependsOn elements
fabric8io · Jul 11, 2017 · e771c09 · e771c09
2 parents 5143cab + e95f9cb
commit e771c09
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/samples/custom-net/pom.xml b/samples/custom-net/pom.xml
@@ -64,7 +64,7 @@
                   <alias>box2</alias>
                 </network>
                 <dependsOn>
-                  <dependsOn>box1</dependsOn>
+                  <container>box1</container>
                 </dependsOn>
                 <namingStrategy>none</namingStrategy>
                 <cmd>

diff --git a/src/main/asciidoc/inc/start/_depends-on.adoc b/src/main/asciidoc/inc/start/_depends-on.adoc
@@ -4,6 +4,7 @@ Your containers should preferably be able to deal with temporarily unresolvable
 
 The `<dependsOn>` configuration can be used to expresses custom network dependencies between your containers. `docker:start` will ensure that all dependencies a container depends on are completely started (fulfilling all `<wait>` conditions) before the depending container is started.
 
+Additionally, each `<container>` element can specify a comma separated set of containers.  Comma (and whitespace) can be used to separate containers since valid docker container names contain only characters, digits, underscores, periods and dashes.
 
 .Example
 [source,xml]

diff --git a/src/main/java/io/fabric8/maven/docker/config/ImageConfiguration.java b/src/main/java/io/fabric8/maven/docker/config/ImageConfiguration.java
@@ -97,7 +97,7 @@ private void addVolumes(RunImageConfiguration runConfig, List<String> ret) {
 
     private void addLinks(RunImageConfiguration runConfig, List<String> ret) {
         // Custom networks can have circular links, no need to be considered for the starting order.
-        if (runConfig.getLinks() != null && !runConfig.getNetworkingConfig().isCustomNetwork()) {
+        if (!runConfig.getNetworkingConfig().isCustomNetwork()) {
             for (String[] link : EnvUtil.splitOnLastColon(runConfig.getLinks())) {
                 ret.add(link[0]);
             }
@@ -114,7 +114,7 @@ private void addContainerNetwork(RunImageConfiguration runConfig, List<String> r
 
     private void addDependsOn(RunImageConfiguration runConfig, List<String> ret) {
         // Only used in custom networks.
-        if (runConfig.getDependsOn() != null && runConfig.getNetworkingConfig().isCustomNetwork()) {
+        if (runConfig.getNetworkingConfig().isCustomNetwork()) {
             for (String link : runConfig.getDependsOn()) {
                 ret.add(link);
             }

diff --git a/src/main/java/io/fabric8/maven/docker/config/RunImageConfiguration.java b/src/main/java/io/fabric8/maven/docker/config/RunImageConfiguration.java
@@ -10,6 +10,8 @@
 
 import io.fabric8.maven.docker.util.EnvUtil;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author roland
  * @since 02.09.14
@@ -189,8 +191,9 @@ public String getDomainname() {
         return domainname;
     }
 
+    @Nonnull
     public List<String> getDependsOn() {
-        return dependsOn;
+        return EnvUtil.splitAtCommasAndTrim(dependsOn);
     }
 
     public String getUser() {
@@ -271,6 +274,7 @@ public RunVolumeConfiguration getVolumeConfiguration() {
         return volumes;
     }
 
+    @Nonnull
     public List<String> getLinks() {
         return EnvUtil.splitAtCommasAndTrim(links);
     }

diff --git a/src/main/java/io/fabric8/maven/docker/util/EnvUtil.java b/src/main/java/io/fabric8/maven/docker/util/EnvUtil.java
@@ -17,6 +17,8 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import javax.annotation.Nonnull;
+
 import static java.util.concurrent.TimeUnit.*;
 
 /**
@@ -124,6 +126,7 @@ public Iterable<String> apply(String input) {
      * @param input Iterable over strings.
      * @return An Iterable over string which breaks down each input element at comma boundaries
      */
+    @Nonnull
     public static List<String> splitAtCommasAndTrim(Iterable<String> input) {
         if(input==null) {
             return Collections.emptyList();