Bump functions docker image to 0.1.1 (#295)

* Set default start timeout to 10 minutes

* Bump nhost/functions to 0.1.1

* Start "functions" container first and provide feedback to a user if it takes too long

* Measure the time taken to start in debug mode

* Remove unnecessary volume

Author: elephant3

cmd/dev.go

@@ -269,7 +269,7 @@ func init() {
 	devCmd.PersistentFlags().Uint32(nhost.PortSMTP, defaultSMTPPort, "Port for smtp server")
 	devCmd.PersistentFlags().Uint32(nhost.PortMinioS3, defaultS3MinioPort, "S3 port for minio")
 	devCmd.PersistentFlags().Uint32(nhost.PortMailhog, defaultMailhogPort, "Port for mailhog UI")
-	devCmd.PersistentFlags().Duration(startTimeoutFlag, 5*time.Minute, "Timeout for starting services")
+	devCmd.PersistentFlags().Duration(startTimeoutFlag, 10*time.Minute, "Timeout for starting services")
 	devCmd.PersistentFlags().BoolVar(&noBrowser, "no-browser", false, "Don't open browser windows automatically")
 
 	devCmd.PersistentFlags().StringVar(&userDefinedHasuraCli, userDefinedHasuraCliFlag, viper.GetString(userDefinedHasuraCliFlag), "User-defined path for hasura-cli binary")

nhost/compose/config.go

@@ -41,7 +41,7 @@ const (
 	svcPostgresDefaultImage  = "nhost/postgres:12-v0.0.6"
 	svcAuthDefaultImage      = "nhost/hasura-auth:0.10.0"
 	svcStorageDefaultImage   = "nhost/hasura-storage:0.2.3"
-	svcFunctionsDefaultImage = "nhost/functions:0.0.4"
+	svcFunctionsDefaultImage = "nhost/functions:0.1.1"
 	svcMinioDefaultImage     = "minio/minio:RELEASE.2022-07-08T00-05-23Z"
 	svcMailhogDefaultImage   = "mailhog/mailhog"
 	svcHasuraDefaultImage    = "hasura/graphql-engine:v2.10.1"
@@ -148,11 +148,6 @@ func (c *Config) build() *types.Config {
 		}
 	}
 
-	// set volumes
-	config.Volumes = types.Volumes{
-		"functions_node_modules": types.VolumeConfig{},
-	}
-
 	c.composeConfig = config
 
 	return config
@@ -360,18 +355,16 @@ func (c Config) functionsService() *types.ServiceConfig {
 		Restart:     types.RestartPolicyAlways,
 		Expose:      []string{"3000"},
 		Environment: c.functionsServiceEnvs().dockerServiceConfigEnv(),
-		HealthCheck: c.functionsServiceHealthcheck(time.Second*3, time.Minute*5),
+		HealthCheck: c.functionsServiceHealthcheck(time.Second*1, time.Minute*30), // 30 minutes is the maximum allowed time for a "functions" service to start, see more below
+		// Probe failure during that period will not be counted towards the maximum number of retries
+		// However, if a health check succeeds during the start period, the container is considered started and all
+		// consecutive failures will be counted towards the maximum number of retries.
 		Volumes: []types.ServiceVolumeConfig{
 			{
 				Type:   types.VolumeTypeBind,
 				Source: "..",
 				Target: "/opt/project",
 			},
-			{
-				Type:   types.VolumeTypeVolume,
-				Source: "functions_node_modules",
-				Target: "/opt/project/node_modules",
-			},
 		},
 	}
 }
@@ -561,9 +554,6 @@ func (c Config) hasuraService() *types.ServiceConfig {
 			SvcPostgres: {
 				Condition: types.ServiceConditionHealthy,
 			},
-			SvcFunctions: {
-				Condition: types.ServiceConditionHealthy,
-			},
 		},
 		Restart: types.RestartPolicyAlways,
 	}

nhost/service/manager.go

@@ -19,6 +19,10 @@ import (
 	"time"
 )
 
+const (
+	slowStartWaitMsg = "It takes more than usual to start the nhost project. Most likely because CLI needs to pull js dependencies inside a container. Please wait..."
+)
+
 type Manager interface {
 	SyncExec(ctx context.Context, f func(ctx context.Context) error) error
 	Start(ctx context.Context) error
@@ -78,22 +82,59 @@ func (m *dockerComposeManager) SetGitBranch(gitBranch string) {
 }
 
 func (m *dockerComposeManager) Start(ctx context.Context) error {
+	startTime := time.Now()
+	defer func() {
+		m.l.Debugf("Start took %s", time.Since(startTime).String())
+	}()
 
 	ds := &compose.DataStreams{}
 
-	if err := m.startPostgresGraphqlFunctions(ctx, ds); err != nil {
+	m.status.Executing("Starting local Nhost project...")
+	m.l.Debug("Starting docker compose")
+
+	// spin up the "functions" container first, because it's the one that's going to take the longest to start
+	// though we don't wait for it to be healthy, only start
+	if err := m.startFunctions(ctx, ds); err != nil {
+		return err
+	}
+
+	if err := m.startPostgresGraphql(ctx, ds); err != nil {
 		return err
 	}
 
 	if err := m.waitForGraphqlEngine(ctx, time.Millisecond*100, time.Minute*2); err != nil {
 		return err
 	}
 
-	// start all containers
+	containersHealthy := make(chan bool)
+
+	go func() {
+		ticker := time.NewTicker(time.Second * 20)
+		defer ticker.Stop()
+
+		showSlowStartMsg := time.After(time.Second * 15)
+
+		for {
+			select {
+			case <-containersHealthy:
+				return
+			case <-ticker.C:
+				m.status.Executingln("Processing...")
+				m.l.Debug("Processing...")
+			case <-showSlowStartMsg:
+				m.status.Executing(slowStartWaitMsg)
+				m.l.Debug(slowStartWaitMsg)
+			}
+		}
+	}()
+
+	// start all containers, this is where we make sure that all containers are up & running, including "functions"
 	if err := m.waitForServicesToBeRunningHealthy(ctx, ds); err != nil {
 		return err
 	}
 
+	containersHealthy <- true
+
 	// ensure default bucket `nhost` exists in Minio S3
 	if err := m.ensureBucketExists(ctx); err != nil {
 		return err
@@ -131,12 +172,28 @@ func (m *dockerComposeManager) Start(ctx context.Context) error {
 	return m.applySeeds(ctx)
 }
 
-func (m *dockerComposeManager) startPostgresGraphqlFunctions(ctx context.Context, ds *compose.DataStreams) error {
-	m.status.Executing("Starting local Nhost project...")
-	m.l.Debug("Starting docker compose")
+func (m *dockerComposeManager) startFunctions(ctx context.Context, ds *compose.DataStreams) error {
+	m.status.Executing("Starting functions...")
+	m.l.Debug("Starting functions")
+
+	cmd, err := compose.WrapperCmd(ctx, []string{"up", "-d", compose.SvcFunctions}, m.composeConfig, ds)
+	if err != nil {
+		if ctx.Err() != nil {
+			return ctx.Err()
+		}
+
+		m.status.Error("Failed to start functions container")
+		m.l.WithError(err).Debug("Failed to start functions")
+		return err
+	}
+
+	m.setProcessToStartInItsOwnProcessGroup(cmd)
+	return nhost.RunCmdAndCaptureStderrIfNotSetup(cmd)
+}
 
-	m.l.Debugf("Starting %s containers...", strings.Join([]string{compose.SvcPostgres, compose.SvcGraphqlEngine, compose.SvcFunctions}, ", "))
-	cmd, err := compose.WrapperCmd(ctx, []string{"up", "-d", "--wait", compose.SvcPostgres, compose.SvcGraphqlEngine, compose.SvcFunctions}, m.composeConfig, ds)
+func (m *dockerComposeManager) startPostgresGraphql(ctx context.Context, ds *compose.DataStreams) error {
+	m.l.Debugf("Starting %s containers...", strings.Join([]string{compose.SvcPostgres, compose.SvcGraphqlEngine}, ", "))
+	cmd, err := compose.WrapperCmd(ctx, []string{"up", "-d", "--wait", compose.SvcPostgres, compose.SvcGraphqlEngine}, m.composeConfig, ds)
 	if err != nil {
 		if ctx.Err() != nil {
 			return ctx.Err()