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: 2 additions & 2 deletions cli/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ all projects in a monorepo (looks for blaxel.toml in subdirectories).`,
cmd.Flags().BoolVar(&experimental, "experimental", false, "Enable experimental features (e.g. USER directive support)")
cmd.Flags().StringArrayVarP(&registryCreds, "registry-cred", "c", []string{}, "Registry credentials (format: registry=username:password, repeatable)")
cmd.Flags().StringVar(&dockerConfigPath, "docker-config", "", "Path to a Docker config.json file with registry credentials")
cmd.Flags().StringVar(&timeoutStr, "timeout", "", "Timeout for build and deployment monitoring (e.g. 30m, 1h). Defaults to 15m")
cmd.Flags().StringVar(&timeoutStr, "timeout", "", "Timeout for build and deployment monitoring (e.g. 30m, 1h). Defaults to 1h")
cmd.Flags().StringVar(&buildEnvPath, "build-env-file", "", "Path to a build env file with Docker build args (default: auto-detect .env.build)")
return cmd
}
Expand Down Expand Up @@ -1465,7 +1465,7 @@ func (d *Deployment) deployAdditionalResource(resource *deploy.Resource, model *
model.AddBuildLog(idx, "Verifying deployment status...")

// Simple status monitoring for additional resources
// Additional resources use a shorter default (10m) than the main resource (15m),
// Additional resources use a shorter default (10m) than the main resource (1h),
// but respect the user-specified --timeout if explicitly provided.
additionalTimeout := 10 * time.Minute
if d.timeoutExplicit {
Expand Down
4 changes: 2 additions & 2 deletions cli/monitor/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ type BuildLogWatcher struct {
}

// DefaultBuildTimeout is the default timeout for build log monitoring.
const DefaultBuildTimeout = 15 * time.Minute
const DefaultBuildTimeout = 1 * time.Hour

// NewBuildLogWatcher creates a new build log watcher.
// The timeout parameter controls the log query window duration.
// Pass 0 to use the default of 15 minutes.
// Pass 0 to use the default of 1 hour.
func NewBuildLogWatcher(client *blaxel.Client, workspace, resourceType, resourceName string, onLog func(string), timeout time.Duration) *BuildLogWatcher {
if timeout <= 0 {
timeout = DefaultBuildTimeout
Expand Down
2 changes: 1 addition & 1 deletion cli/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ For private registries, supply credentials via --registry-cred or --docker-confi
cmd.Flags().BoolVarP(&noTTY, "yes", "y", false, "Skip interactive mode")
cmd.Flags().StringArrayVarP(&registryCreds, "registry-cred", "c", []string{}, "Registry credentials (format: registry=username:password, repeatable)")
cmd.Flags().StringVar(&dockerConfigPath, "docker-config", "", "Path to a Docker config.json file with registry credentials")
cmd.Flags().StringVar(&timeoutStr, "timeout", "", "Timeout for build log monitoring (e.g. 30m, 1h). Defaults to 15m")
cmd.Flags().StringVar(&timeoutStr, "timeout", "", "Timeout for build log monitoring (e.g. 30m, 1h). Defaults to 1h")
cmd.Flags().StringVar(&buildEnvPath, "build-env-file", "", "Path to a build env file with Docker build args (default: auto-detect .env.build)")
cmd.Flags().BoolVar(&skipBuild, "skip-build", false, "Skip the image build step (use existing built image if available)")

Expand Down
Loading