Merge pull request moby#3858 from tonistiigi/llb-platform-fixes

llb: don't include platform in fileop proto

Author: tonistiigi

client/llb/diff.go

@@ -106,5 +106,5 @@ func Diff(lower, upper State, opts ...ConstraintsOpt) State {
 	for _, o := range opts {
 		o.SetConstraintsOption(&c)
 	}
-	return NewState(NewDiff(lower, upper, c).Output())
+	return lower.WithOutput(NewDiff(lower, upper, c).Output())
 }

client/llb/fileop.go

@@ -724,6 +724,7 @@ func (f *FileOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, []
 	}
 
 	pop, md := MarshalConstraints(c, &f.constraints)
+	pop.Platform = nil // file op is not platform specific
 	pop.Op = &pb.Op_File{
 		File: pfo,
 	}

client/llb/merge.go

@@ -117,5 +117,5 @@ func Merge(inputs []State, opts ...ConstraintsOpt) State {
 		o.SetConstraintsOption(&c)
 	}
 	addCap(&c, pb.CapMergeOp)
-	return NewState(NewMerge(filteredInputs, c).Output())
+	return filteredInputs[0].WithOutput(NewMerge(filteredInputs, c).Output())
 }

client/llb/state_test.go

@@ -144,27 +144,35 @@ func TestPlatformFromImage(t *testing.T) {
 
 	s := Image("srcimage", LinuxS390x).
 		Run(Args([]string{"foo"})).
-		File(Mkdir("/foo", 0700).Mkfile("/bar", 0600, []byte("bar")))
+		File(Mkdir("/foo", 0700).Mkfile("/bar", 0600, []byte("bar"))).
+		Run(Args([]string{"afterfile"})).Root()
 
-	dest := Image("destimage").File(Copy(s, "/", "/"))
+	dest := Image("destimage").File(Copy(s, "/", "/")).Run(Args([]string{"afterfile"}))
 
 	def, err := dest.Marshal(context.TODO(), LinuxPpc64le)
 	require.NoError(t, err)
 
 	m, arr := parseDef(t, def.Def)
 	_ = m
-	require.Equal(t, 6, len(arr))
+	require.Equal(t, 8, len(arr))
 
 	dgst, idx := last(t, arr)
 	require.Equal(t, 0, idx)
 
 	vtx, ok := m[dgst]
 	require.Equal(t, true, ok)
 
+	_, ok = vtx.Op.(*pb.Op_Exec)
+	require.Equal(t, true, ok)
+	require.Equal(t, "ppc64le", vtx.Platform.Architecture)
+
+	vtx, ok = m[vtx.Inputs[0].Digest]
+	require.Equal(t, true, ok)
+
 	f, ok := vtx.Op.(*pb.Op_File)
 	require.Equal(t, true, ok)
 	require.Equal(t, 1, len(f.File.Actions))
-	require.Equal(t, "ppc64le", vtx.Platform.Architecture)
+	require.Nil(t, vtx.Platform)
 
 	mainVtx := vtx
 	vtx, ok = m[vtx.Inputs[0].Digest]
@@ -178,10 +186,17 @@ func TestPlatformFromImage(t *testing.T) {
 	vtx, ok = m[mainVtx.Inputs[1].Digest]
 	require.Equal(t, true, ok)
 
+	_, ok = vtx.Op.(*pb.Op_Exec)
+	require.Equal(t, true, ok)
+	require.Equal(t, "s390x", vtx.Platform.Architecture)
+
+	vtx, ok = m[vtx.Inputs[0].Digest]
+	require.Equal(t, true, ok)
+
 	f, ok = vtx.Op.(*pb.Op_File)
 	require.Equal(t, true, ok)
 	require.Equal(t, 2, len(f.File.Actions))
-	require.Equal(t, "s390x", vtx.Platform.Architecture)
+	require.Nil(t, vtx.Platform)
 
 	vtx, ok = m[vtx.Inputs[0].Digest]
 	require.Equal(t, true, ok)
@@ -199,6 +214,57 @@ func TestPlatformFromImage(t *testing.T) {
 	require.Equal(t, "s390x", vtx.Platform.Architecture)
 }
 
+func TestPlatformFromImageWithMerge(t *testing.T) {
+	t.Parallel()
+
+	s := Image("srcimage", LinuxS390x)
+
+	s2 := Scratch().File(Mkdir("/foo", 0700).Mkfile("/bar", 0600, []byte("bar")))
+
+	dest := Merge([]State{s, s2}).Run(Args([]string{"aftermerge"}))
+
+	def, err := dest.Marshal(context.TODO(), LinuxPpc64le)
+	require.NoError(t, err)
+
+	m, arr := parseDef(t, def.Def)
+	_ = m
+	require.Equal(t, 5, len(arr))
+
+	dgst, idx := last(t, arr)
+	require.Equal(t, 0, idx)
+
+	vtx, ok := m[dgst]
+	require.Equal(t, true, ok)
+
+	_, ok = vtx.Op.(*pb.Op_Exec)
+	require.Equal(t, true, ok)
+	require.Equal(t, "s390x", vtx.Platform.Architecture)
+
+	vtx, ok = m[vtx.Inputs[0].Digest]
+	require.Equal(t, true, ok)
+
+	_, ok = vtx.Op.(*pb.Op_Merge)
+	require.Equal(t, true, ok)
+	require.Nil(t, vtx.Platform)
+
+	mainVtx := vtx
+	vtx, ok = m[vtx.Inputs[0].Digest]
+	require.Equal(t, true, ok)
+
+	src, ok := vtx.Op.(*pb.Op_Source)
+	require.Equal(t, true, ok)
+	require.Equal(t, "docker-image://docker.io/library/srcimage:latest", src.Source.Identifier)
+	require.Equal(t, "s390x", vtx.Platform.Architecture)
+
+	vtx, ok = m[mainVtx.Inputs[1].Digest]
+	require.Equal(t, true, ok)
+
+	f, ok := vtx.Op.(*pb.Op_File)
+	require.Equal(t, true, ok)
+	require.Equal(t, 2, len(f.File.Actions))
+	require.Nil(t, vtx.Platform)
+}
+
 func getEnvHelper(t *testing.T, s State, k string) (string, bool) {
 	t.Helper()
 	v, ok, err := s.GetEnv(context.TODO(), k)