set "user" as default for template builds

Author: dobrac

packages/orchestrator/internal/template/build/builder.go

@@ -25,6 +25,7 @@ import (
 	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/phases/base"
 	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/phases/finalize"
 	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/phases/steps"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/phases/user"
 	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/storage/cache"
 	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/writer"
 	buildcache "github.com/e2b-dev/infra/packages/orchestrator/internal/template/cache"
@@ -230,6 +231,18 @@ func runBuild(
 		builder.proxy,
 	)
 
+	userBuilder := user.New(
+		bc,
+		builder.sandboxFactory,
+		builder.logger,
+		builder.proxy,
+		layerExecutor,
+		commandExecutor,
+		index,
+		builder.metrics,
+		config.TemplateDefaultUser,
+	)
+
 	stepBuilders := steps.CreateStepPhases(
 		bc,
 		builder.sandboxFactory,
@@ -253,6 +266,10 @@ func runBuild(
 	builders := []phases.BuilderPhase{
 		baseBuilder,
 	}
+	// For v1 builds the default user is not set
+	if !bc.IsV1Build {
+		builders = append(builders, userBuilder)
+	}
 	builders = append(builders, stepBuilders...)
 	builders = append(builders, postProcessingBuilder)
 

packages/orchestrator/internal/template/build/config/config.go

@@ -6,7 +6,12 @@ import (
 	"github.com/e2b-dev/infra/packages/shared/pkg/storage/header"
 )
 
-const InstanceBuildPrefix = "b"
+const (
+	InstanceBuildPrefix = "b"
+
+	// TemplateDefaultUser is the default user to use in the template to run all commands.
+	TemplateDefaultUser = "user"
+)
 
 type TemplateConfig struct {
 	// TeamID is the ID of the team to build the template for.

packages/orchestrator/internal/template/build/phases/base/builder.go

@@ -32,6 +32,7 @@ import (
 	"github.com/e2b-dev/infra/packages/shared/pkg/dockerhub"
 	"github.com/e2b-dev/infra/packages/shared/pkg/id"
 	"github.com/e2b-dev/infra/packages/shared/pkg/storage"
+	"github.com/e2b-dev/infra/packages/shared/pkg/utils"
 )
 
 func templatesDirectory() string {
@@ -338,8 +339,7 @@ func (bb *BaseBuilder) Layer(
 
 		// This is a compatibility for v1 template builds
 		if bb.IsV1Build {
-			cwd := "/home/user"
-			cmdMeta.WorkDir = &cwd
+			cmdMeta.WorkDir = utils.ToPtr("/home/user")
 		}
 
 		meta := metadata.Template{

packages/orchestrator/internal/template/build/phases/user/builder.go

@@ -0,0 +1,72 @@
+package user
+
+import (
+	"context"
+	"fmt"
+
+	"go.uber.org/zap"
+
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/proxy"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/sandbox"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/buildcontext"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/commands"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/layer"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/metrics"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/phases"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/phases/steps"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/storage/cache"
+	template_manager "github.com/e2b-dev/infra/packages/shared/pkg/grpc/template-manager"
+)
+
+type UserBuilder struct {
+	*steps.StepBuilder
+
+	user string
+}
+
+func New(
+	buildContext buildcontext.BuildContext,
+	sandboxFactory *sandbox.Factory,
+	logger *zap.Logger,
+	proxy *proxy.SandboxProxy,
+	layerExecutor *layer.LayerExecutor,
+	commandExecutor *commands.CommandExecutor,
+	index cache.Index,
+	metrics *metrics.BuildMetrics,
+	user string,
+) *UserBuilder {
+	return &UserBuilder{
+		StepBuilder: steps.New(
+			buildContext,
+			sandboxFactory,
+			logger,
+			proxy,
+			layerExecutor,
+			commandExecutor,
+			index,
+			metrics,
+			&template_manager.TemplateStep{
+				Type: "USER",
+				Args: []string{user},
+			},
+			// This step number shouldn't be used, but in case it does, defining as 1
+			1,
+		),
+		user: user,
+	}
+}
+
+func (ub *UserBuilder) Prefix() string {
+	return "base"
+}
+
+func (ub *UserBuilder) String(ctx context.Context) (string, error) {
+	return fmt.Sprintf("DEFAULT USER %s", ub.user), nil
+}
+
+func (ub *UserBuilder) Metadata() phases.PhaseMeta {
+	return phases.PhaseMeta{
+		Phase:    metrics.PhaseBase,
+		StepType: "base",
+	}
+}

packages/orchestrator/internal/template/build/phases/user/hash.go

@@ -0,0 +1,14 @@
+package user
+
+import (
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/phases"
+	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/storage/cache"
+)
+
+func (ub *UserBuilder) Hash(sourceLayer phases.LayerResult) (string, error) {
+	return cache.HashKeys(
+		sourceLayer.Hash,
+		"DEFAULT USER",
+		ub.user,
+	), nil
+}