Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion environment/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,12 @@ func (env *Environment) RunBackground(ctx context.Context, explanation, command,
}

// Start the service
startCtx, cancel := context.WithTimeout(ctx, serviceStartTimeout)
defer cancel()
svc, err := serviceState.AsService(dagger.ContainerAsServiceOpts{
Args: args,
UseEntrypoint: useEntrypoint,
}).Start(ctx)
}).Start(startCtx)
if err != nil {
var exitErr *dagger.ExecError
if errors.As(err, &exitErr) {
Expand Down
9 changes: 8 additions & 1 deletion environment/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ import (
"context"
"errors"
"fmt"
"time"

"dagger.io/dagger"
)

var (
serviceStartTimeout = 30 * time.Second
)

type Service struct {
Config *ServiceConfig `json:"config"`
Endpoints EndpointMappings `json:"endpoints"`
Expand Down Expand Up @@ -59,10 +64,12 @@ func (env *Environment) startService(ctx context.Context, cfg *ServiceConfig) (*
}

// Start the service
startCtx, cancel := context.WithTimeout(ctx, serviceStartTimeout)
defer cancel()
svc, err := container.AsService(dagger.ContainerAsServiceOpts{
Args: args,
UseEntrypoint: true,
}).Start(ctx)
}).Start(startCtx)
if err != nil {
var exitErr *dagger.ExecError
if errors.As(err, &exitErr) {
Expand Down