Faster failure on startup if container fails, fixes #1135 (#1144)

ddev · Oct 1, 2018 · 66a6eae · 66a6eae
1 parent a399558
commit 66a6eae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/ddevapp/ddevapp.go b/pkg/ddevapp/ddevapp.go
@@ -808,7 +808,7 @@ func (app *DdevApp) Wait(containerTypes ...string) error {
 		}
 		err := dockerutil.ContainerWait(containerWaitTimeout, labels)
 		if err != nil {
-			return fmt.Errorf("%s service %v", containerType, err)
+			return fmt.Errorf("%s container failed: %v", containerType, err)
 		}
 	}
 

diff --git a/pkg/dockerutil/dockerutils.go b/pkg/dockerutil/dockerutils.go
@@ -152,8 +152,12 @@ func ContainerWait(waittime time.Duration, labels map[string]string) error {
 			}
 			status = GetContainerHealth(container)
 
-			if status == "healthy" {
+			switch status {
+			case "healthy":
 				return nil
+			case "exited":
+				service := container.Labels["com.docker.compose.service"]
+				return fmt.Errorf("container start failed, please use 'ddev logs -s %s` to find out why it failed", service)
 			}
 		}
 	}