Update dagger engine to uses a given architecture instead of default one.

Check #1071 for more details

Signed-off-by: Tom Chauveau <tom.chauveau@epitech.eu>

client/client.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/containerd/containerd/platforms"
 	"go.opentelemetry.io/otel"
 	"golang.org/x/sync/errgroup"
 
@@ -80,7 +81,7 @@ func (c *Client) Do(ctx context.Context, state *state.State, fn DoFunc) error {
 	lg := log.Ctx(ctx)
 	eg, gctx := errgroup.WithContext(ctx)
 
-	environment, err := environment.New(state)
+	env, err := environment.New(state)
 	if err != nil {
 		return err
 	}
@@ -96,7 +97,7 @@ func (c *Client) Do(ctx context.Context, state *state.State, fn DoFunc) error {
 
 	// Spawn build function
 	eg.Go(func() error {
-		return c.buildfn(gctx, state, environment, fn, events)
+		return c.buildfn(gctx, state, env, fn, events)
 	})
 
 	return eg.Wait()
@@ -200,7 +201,7 @@ func (c *Client) buildfn(ctx context.Context, st *state.State, env *environment.
 				llb.WithCustomName("[internal] serializing computed values"),
 			)
 
-		ref, err := s.Solve(ctx, st)
+		ref, err := s.Solve(ctx, st, platforms.DefaultSpec())
 		if err != nil {
 			return nil, err
 		}

cmd/dagger/cmd/compute.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"cuelang.org/go/cue"
+	"github.com/containerd/containerd/platforms"
 	"go.dagger.io/dagger/cmd/dagger/cmd/common"
 	"go.dagger.io/dagger/cmd/dagger/logger"
 	"go.dagger.io/dagger/compiler"
@@ -41,8 +42,9 @@ var computeCmd = &cobra.Command{
 		doneCh := common.TrackCommand(ctx, cmd)
 
 		st := &state.State{
-			Name: "FIXME",
+			Name:         "FIXME",
-			Path: args[0],
+			Architecture: platforms.Format(platforms.DefaultSpec()),
+			Path:         args[0],
 			Plan: state.Plan{
 				Module: args[0],
 			},

cmd/dagger/cmd/edit.go

@@ -73,6 +73,7 @@ var editCmd = &cobra.Command{
 			lg.Fatal().Err(err).Msg("failed to decode file")
 		}
 		st.Name = newState.Name
+		st.Architecture = newState.Architecture
 		st.Plan = newState.Plan
 		st.Inputs = newState.Inputs
 

environment/environment.go

@@ -7,6 +7,7 @@ import (
 
 	"cuelang.org/go/cue"
 	cueflow "cuelang.org/go/tools/flow"
+	"github.com/containerd/containerd/platforms"
 	"go.dagger.io/dagger/compiler"
 	"go.dagger.io/dagger/solver"
 	"go.dagger.io/dagger/state"
@@ -137,7 +138,7 @@ func (e *Environment) Up(ctx context.Context, s solver.Solver) error {
 	flow := cueflow.New(
 		&cueflow.Config{},
 		e.src.Cue(),
-		newTaskFunc(newPipelineRunner(e.computed, s)),
+		newTaskFunc(newPipelineRunner(e.computed, s, e.state.Architecture)),
 	)
 	if err := flow.Run(ctx); err != nil {
 		return err
@@ -176,7 +177,7 @@ func noOpRunner(t *cueflow.Task) error {
 	return nil
 }
 
-func newPipelineRunner(computed *compiler.Value, s solver.Solver) cueflow.RunnerFunc {
+func newPipelineRunner(computed *compiler.Value, s solver.Solver, platform string) cueflow.RunnerFunc {
 	return cueflow.RunnerFunc(func(t *cueflow.Task) error {
 		ctx := t.Context()
 		lg := log.
@@ -197,8 +198,19 @@ func newPipelineRunner(computed *compiler.Value, s solver.Solver) cueflow.Runner
 				Msg("dependency detected")
 		}
 		v := compiler.Wrap(t.Value())
-		p := NewPipeline(v, s)
+
-		err := p.Run(ctx)
+		platform, err := platforms.Parse(platform)
+		if err != nil {
+			// Record the error
+			span.AddEvent("command", trace.WithAttributes(
+				attribute.String("error", err.Error()),
+			))
+
+			return err
+		}
+
+		p := NewPipeline(v, s, platform)
+		err = p.Run(ctx)
 		if err != nil {
 			// Record the error
 			span.AddEvent("command", trace.WithAttributes(

environment/pipeline.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"cuelang.org/go/cue"
+	bkplatforms "github.com/containerd/containerd/platforms"
 	"github.com/docker/distribution/reference"
 	bk "github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/client/llb"
@@ -22,6 +23,7 @@ import (
 	bkgw "github.com/moby/buildkit/frontend/gateway/client"
 	bkpb "github.com/moby/buildkit/solver/pb"
 	digest "github.com/opencontainers/go-digest"
+	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/rs/zerolog/log"
 	"gopkg.in/yaml.v3"
 
@@ -44,15 +46,17 @@ type Pipeline struct {
 	name     string
 	s        solver.Solver
 	state    llb.State
+	platform specs.Platform // Architecture constraint
 	result   bkgw.Reference
 	image    dockerfile2llb.Image
 	computed *compiler.Value
 }
 
-func NewPipeline(code *compiler.Value, s solver.Solver) *Pipeline {
+func NewPipeline(code *compiler.Value, s solver.Solver, platform specs.Platform) *Pipeline {
 	return &Pipeline{
 		code:     code,
 		name:     code.Path().String(),
+		platform: platform,
 		s:        s,
 		state:    llb.Scratch(),
 		computed: compiler.NewValue(),
@@ -229,7 +233,7 @@ func (p *Pipeline) run(ctx context.Context) error {
 		// so that errors map to the correct cue path.
 		// FIXME: might as well change FS to make every operation
 		// synchronous.
-		p.result, err = p.s.Solve(ctx, p.state)
+		p.result, err = p.s.Solve(ctx, p.state, p.platform)
 		if err != nil {
 			return err
 		}
@@ -335,7 +339,7 @@ func (p *Pipeline) Copy(ctx context.Context, op *compiler.Value, st llb.State) (
 		return st, err
 	}
 	// Execute 'from' in a tmp pipeline, and use the resulting fs
-	from := NewPipeline(op.Lookup("from"), p.s)
+	from := NewPipeline(op.Lookup("from"), p.s, p.platform)
 	if err := from.Run(ctx); err != nil {
 		return st, err
 	}
@@ -591,7 +595,7 @@ func (p *Pipeline) mount(ctx context.Context, dest string, mnt *compiler.Value)
 		return nil, fmt.Errorf("invalid mount: should have %s structure",
 			"{from: _, path: string | *\"/\"}")
 	}
-	from := NewPipeline(mnt.Lookup("from"), p.s)
+	from := NewPipeline(mnt.Lookup("from"), p.s, p.platform)
 	if err := from.Run(ctx); err != nil {
 		return nil, err
 	}
@@ -737,7 +741,7 @@ func parseStringOrSecret(ctx context.Context, ss solver.SecretsStore, v *compile
 
 func (p *Pipeline) Load(ctx context.Context, op *compiler.Value, st llb.State) (llb.State, error) {
 	// Execute 'from' in a tmp pipeline, and use the resulting fs
-	from := NewPipeline(op.Lookup("from"), p.s)
+	from := NewPipeline(op.Lookup("from"), p.s, p.platform)
 	if err := from.Run(ctx); err != nil {
 		return st, err
 	}
@@ -795,7 +799,8 @@ func (p *Pipeline) FetchContainer(ctx context.Context, op *compiler.Value, st ll
 
 	// Load image metadata and convert to to LLB.
 	p.image, err = p.s.ResolveImageConfig(ctx, ref.String(), llb.ResolveImageConfigOpt{
-		LogName: p.vertexNamef("load metadata for %s", ref.String()),
+		LogName:  p.vertexNamef("load metadata for %s", ref.String()),
+		Platform: &p.platform,
 	})
 	if err != nil {
 		return st, err
@@ -855,18 +860,18 @@ func (p *Pipeline) PushContainer(ctx context.Context, op *compiler.Value, st llb
 		return st, err
 	}
 
-	if digest, ok := resp.ExporterResponse["containerimage.digest"]; ok {
+	if dgst, ok := resp.ExporterResponse["containerimage.digest"]; ok {
 		imageRef := fmt.Sprintf(
 			"%s@%s",
 			resp.ExporterResponse["image.name"],
-			digest,
+			dgst,
 		)
 
 		return st.File(
 			llb.Mkdir("/dagger", fs.FileMode(0755)),
 			llb.WithCustomName(p.vertexNamef("Mkdir /dagger")),
 		).File(
-			llb.Mkfile("/dagger/image_digest", fs.FileMode(0644), []byte(digest)),
+			llb.Mkfile("/dagger/image_digest", fs.FileMode(0644), []byte(dgst)),
 			llb.WithCustomName(p.vertexNamef("Storing image digest to /dagger/image_digest")),
 		).File(
 			llb.Mkfile("/dagger/image_ref", fs.FileMode(0644), []byte(imageRef)),
@@ -1068,7 +1073,7 @@ func (p *Pipeline) DockerBuild(ctx context.Context, op *compiler.Value, st llb.S
 	// docker build context. This can come from another component, so we need to
 	// compute it first.
 	if dockerContext.Exists() {
-		from := NewPipeline(op.Lookup("context"), p.s)
+		from := NewPipeline(op.Lookup("context"), p.s, p.platform)
 		if err := from.Run(ctx); err != nil {
 			return st, err
 		}
@@ -1107,6 +1112,11 @@ func (p *Pipeline) DockerBuild(ctx context.Context, op *compiler.Value, st llb.S
 		opts["no-cache"] = ""
 	}
 
+	// Set platform to configured one if no one is defined
+	if opts["platform"] == "" {
+		opts["platform"] = bkplatforms.Format(p.platform)
+	}
+
 	req := bkgw.SolveRequest{
 		Frontend:    "dockerfile.v0",
 		FrontendOpt: opts,

go.mod

@@ -7,6 +7,7 @@ require (
 	filippo.io/age v1.0.0
 	github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db
 	github.com/containerd/console v1.0.3
+	github.com/containerd/containerd v1.5.4 // indirect
 	github.com/docker/buildx v0.6.2
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/emicklei/proto v1.9.0 // indirect
@@ -21,6 +22,7 @@ require (
 	github.com/moby/buildkit v0.9.1
 	github.com/morikuni/aec v1.0.0
 	github.com/opencontainers/go-digest v1.0.0
+	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/rs/zerolog v1.23.0
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/viper v1.8.1

solver/solver.go

@@ -16,6 +16,7 @@ import (
 	"github.com/moby/buildkit/session"
 	bkpb "github.com/moby/buildkit/solver/pb"
 	"github.com/opencontainers/go-digest"
+	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/rs/zerolog/log"
 )
 
@@ -79,9 +80,9 @@ func (s Solver) AddCredentials(target, username, secret string) {
 	s.opts.Auth.AddCredentials(target, username, secret)
 }
 
-func (s Solver) Marshal(ctx context.Context, st llb.State) (*bkpb.Definition, error) {
+func (s Solver) Marshal(ctx context.Context, st llb.State, co ...llb.ConstraintsOpt) (*bkpb.Definition, error) {
 	// FIXME: do not hardcode the platform
-	def, err := st.Marshal(ctx, llb.LinuxAmd64)
+	def, err := st.Marshal(ctx, co...)
 	if err != nil {
 		return nil, err
 	}
@@ -126,9 +127,9 @@ func (s Solver) SolveRequest(ctx context.Context, req bkgw.SolveRequest) (*bkgw.
 }
 
 // Solve will block until the state is solved and returns a Reference.
-func (s Solver) Solve(ctx context.Context, st llb.State) (bkgw.Reference, error) {
+// It takes a platform as argument which correspond to the architecture.
-	// marshal llb
+func (s Solver) Solve(ctx context.Context, st llb.State, platform specs.Platform) (bkgw.Reference, error) {
-	def, err := s.Marshal(ctx, st)
+	def, err := s.Marshal(ctx, st, llb.Platform(platform))
 	if err != nil {
 		return nil, err
 	}

state/project.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/containerd/containerd/platforms"
 	"github.com/rs/zerolog/log"
 	"go.dagger.io/dagger/keychain"
 	"go.dagger.io/dagger/stdlib"
@@ -182,6 +183,10 @@ func (w *Project) Get(ctx context.Context, name string) (*State, error) {
 	}
 	st.Project = w.Path
 
+	if st.Architecture == "" {
+		st.Architecture = platforms.DefaultString()
+	}
+
 	computed, err := os.ReadFile(path.Join(envPath, stateDir, computedFile))
 	if err == nil {
 		st.Computed = string(computed)
@@ -263,7 +268,8 @@ func (w *Project) Create(ctx context.Context, name string, plan Plan) (*State, e
 		Plan: Plan{
 			Package: pkg,
 		},
-		Name: name,
+		Name:         name,
+		Architecture: platforms.DefaultString(),
 	}
 
 	data, err := yaml.Marshal(st)

state/state.go

@@ -24,6 +24,9 @@ type State struct {
 	// FIXME: store multiple names?
 	Name string `yaml:"name,omitempty"`
 
+	// Architecture execution
+	Architecture string `yaml:"architecture,omitempty"`
+
 	// User Inputs
 	Inputs map[string]Input `yaml:"inputs,omitempty"`