fix: the web container startup time should be more generous, fixes #5343

 (#5444)

pkg/ddevapp/app_compose_template.yaml

@@ -79,8 +79,9 @@ services:
       {{ end }}
       interval: 1s
       retries: 120
-      start_period: 120s
-      timeout: "{{ .DefaultContainerTimeout }}s"
+      start_period: "{{ .DefaultContainerTimeout }}s"
+      start_interval: 1s
+      timeout: 70s
   {{ end }} {{/* end if not .OmitDB */}}
 
   web:
@@ -240,8 +241,9 @@ services:
     healthcheck:
       interval: 1s
       retries: 120
-      start_period: 120s
-      timeout: "{{ .DefaultContainerTimeout }}s"
+      start_period: "{{ .DefaultContainerTimeout }}s"
+      start_interval: 1s
+      timeout: 70s
 
 networks:
   ddev_default:

pkg/ddevapp/config.go

@@ -130,6 +130,10 @@ func NewApp(appRoot string, includeOverrides bool) (*DdevApp, error) {
 
 	if app.DefaultContainerTimeout == "" {
 		app.DefaultContainerTimeout = nodeps.DefaultDefaultContainerTimeout
+		// On Windows the default timeout may be too short for mutagen to succeed.
+		if runtime.GOOS == "windows" {
+			app.DefaultContainerTimeout = "240"
+		}
 	}
 
 	// Migrate UploadDir to UploadDirs

pkg/ddevapp/snapshot.go

@@ -222,6 +222,9 @@ func (app *DdevApp) RestoreSnapshot(snapshotName string) error {
 	_ = os.Setenv("DDEV_DB_CONTAINER_COMMAND", restoreCmd)
 	// nolint: errcheck
 	defer os.Unsetenv("DDEV_DB_CONTAINER_COMMAND")
+	// Allow extra time by default for the snapshot restore. This is arbitrary but may help.
+	origTimeout := app.DefaultContainerTimeout
+	app.DefaultContainerTimeout = "600"
 	err = app.Start()
 	if err != nil {
 		return fmt.Errorf("failed to start project for RestoreSnapshot: %v", err)
@@ -251,6 +254,7 @@ func (app *DdevApp) RestoreSnapshot(snapshotName string) error {
 			fmt.Print(".")
 		}
 	}
+	app.DefaultContainerTimeout = origTimeout
 	util.Success("\nDatabase snapshot %s was restored in %vs", snapshotName, int(time.Since(start).Seconds()))
 	err = app.ProcessHooks("post-restore-snapshot")
 	if err != nil {