Fix fabric8io#986 : Create volumes with proper configuration during "…

…docker:start"
rohanKanojia · Apr 22, 2018 · 5f45bfe · 5f45bfe
1 parent b57bc9e
commit 5f45bfe
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -2,6 +2,7 @@
 
 * **0.25.2** (2018-04-14)
   - Fix for docker login issue with index.docker.io using a credential helper ([#946](https://github.com/fabric8io/docker-maven-plugin/issues/946))
+  - Fix for creating volumes with proper configuration during "docker:start" ([#986](https://github.com/fabric8io/docker-maven-plugin/issues/986))
 
 * **0.25.1** (2018-04-12)
   - Fix regression which broke labels and env with space ([#988](https://github.com/fabric8io/docker-maven-plugin/issues/988))

diff --git a/src/main/java/io/fabric8/maven/docker/StartMojo.java b/src/main/java/io/fabric8/maven/docker/StartMojo.java
@@ -322,6 +322,11 @@ private Queue<ImageConfiguration> prepareStart(ServiceHub hub, QueryService quer
                                                          queryService.hasImage(imageConfig.getName()));
 
             NetworkConfig config = runConfig.getNetworkingConfig();
+            RunVolumeConfiguration runVolumeConfig = runConfig.getVolumeConfiguration();
+            if(!runVolumeConfig.getBind().isEmpty()) {
+                List<VolumeConfiguration> volumes = getVolumes();
+                createVolumesAsPerVolumeBinds(hub, runVolumeConfig.getBind(), volumes);
+            }
             if (autoCreateCustomNetworks && config.isCustomNetwork()) {
                 runService.createCustomNetworkIfNotExistant(config.getCustomNetwork());
             }
@@ -331,6 +336,26 @@ private Queue<ImageConfiguration> prepareStart(ServiceHub hub, QueryService quer
         return imagesWaitingToStart;
     }
 
+    private void createVolumesAsPerVolumeBinds(ServiceHub hub, List<String> volumeBinds, List<VolumeConfiguration> volumesConfigs)
+        throws DockerAccessException {
+        Map<String, Integer> aIndexMap = new HashMap();
+        for(Integer aIndex = 0; aIndex < volumesConfigs.size(); aIndex++)
+            aIndexMap.put(volumesConfigs.get(aIndex).getName(), aIndex);
+
+        for(String aVolumeBind : volumeBinds) {
+            if(aVolumeBind.contains(":")) {
+                aVolumeBind = aVolumeBind.substring(0, aVolumeBind.indexOf(":"));
+            }
+            Integer nVolumeConfigIndex = aIndexMap.get(aVolumeBind);
+            if(nVolumeConfigIndex != null && nVolumeConfigIndex >= 0 && nVolumeConfigIndex < volumesConfigs.size()) {
+                VolumeConfiguration aVolumeConfig = volumesConfigs.get(nVolumeConfigIndex);
+                hub.getVolumeService().createVolume(aVolumeConfig);
+            } else {
+                log.warn("No volumeBind found with name : " + aVolumeBind + " " + aIndexMap.toString());
+            }
+        }
+    }
+
     private String determinePullPolicy(RunImageConfiguration runConfig) {
         return runConfig.getImagePullPolicy() != null ? runConfig.getImagePullPolicy() : imagePullPolicy;
     }