fabric8io#970 postStart exec breakOnError should fail fast

Signed-off-by: Jimmy Praet <jimmy.praet@ksz-bcss.fgov.be>
kszbcss · Mar 18, 2018 · 97bfc90 · 97bfc90
1 parent 689b7e0
commit 97bfc90
Showing 1 changed file with 26 additions and 13 deletions.
diff --git a/src/main/java/io/fabric8/maven/docker/StartMojo.java b/src/main/java/io/fabric8/maven/docker/StartMojo.java
@@ -142,21 +142,14 @@ public synchronized void executeInternal(final ServiceHub hub) throws DockerAcce
                     // Move from waiting to starting status
                     imagesStarting.add(image);
                     imagesWaitingToStart.remove(image);
+
+                    if (!startParallel) {
+                        waitForStartedContainer(hub, containerStartupService, startedContainerAliases, imagesStarting);
+                    }
                 }
 
-                // Wait for the next container to finish startup
-                final Future<StartedContainer> startedContainerFuture = containerStartupService.take();
-                try {
-                    final StartedContainer startedContainer = startedContainerFuture.get();
-                    final ImageConfiguration imageConfig = startedContainer.imageConfig;
-
-                    updateAliasesSet(startedContainerAliases, imageConfig.getAlias());
-                    exposeContainerProps(hub.getQueryService(), startedContainer);
-
-                    // All done with this image
-                    imagesStarting.remove(imageConfig);
-                } catch (ExecutionException e) {
-                    rethrowCause(e);
+                if (startParallel) {
+                	waitForStartedContainer(hub, containerStartupService, startedContainerAliases, imagesStarting);
                 }
             }
 
@@ -184,6 +177,26 @@ public synchronized void executeInternal(final ServiceHub hub) throws DockerAcce
         }
     }
 
+	private void waitForStartedContainer(final ServiceHub hub,
+			final ExecutorCompletionService<StartedContainer> containerStartupService,
+			final Set<String> startedContainerAliases, final Queue<ImageConfiguration> imagesStarting)
+			throws InterruptedException, DockerAccessException, IOException, ExecException {
+		// Wait for the next container to finish startup
+		final Future<StartedContainer> startedContainerFuture = containerStartupService.take();
+		try {
+		    final StartedContainer startedContainer = startedContainerFuture.get();
+		    final ImageConfiguration imageConfig = startedContainer.imageConfig;
+
+		    updateAliasesSet(startedContainerAliases, imageConfig.getAlias());
+		    exposeContainerProps(hub.getQueryService(), startedContainer);
+
+		    // All done with this image
+		    imagesStarting.remove(imageConfig);
+		} catch (ExecutionException e) {
+		    rethrowCause(e);
+		}
+	}
+
     protected Boolean followLogs() {
         return Boolean.valueOf(System.getProperty("docker.follow", "false"));
     }