Drop container_config from v1.Config (google#546)

This is a holdover from docker days and isn't present in
opencontainers/image-spec.

Author: jonjohnsonjr

pkg/crane/example_test.go

@@ -27,5 +27,5 @@ func Example() {
 	i, _ := crane.Image(c)
 	d, _ := i.Digest()
 	fmt.Println(d)
-	// Output: sha256:7f384dc9f331568b53484d1a31b85188be61c1161e37c5988abe304969268a8c
+	// Output: sha256:09fb0c6289cefaad8c74c7e5fd6758ad6906ab8f57f1350d9f4eb5a7df45ff8b
 }

pkg/crane/filemap_test.go

@@ -91,20 +91,20 @@ func TestImage(t *testing.T) {
 		Digest  string
 	}{{
 		Name:   "Empty contents",
-		Digest: "sha256:009d931e3fe0c1375ccb0dbe221d83f5f8a292c8ba6a9ac04725b2ee36b51df0",
+		Digest: "sha256:98132f58b523c391a5788997327cac95e114e3a6609d01163189774510705399",
 	}, {
 		Name: "One file",
 		FileMap: map[string][]byte{
 			"/test": []byte("testy"),
 		},
-		Digest: "sha256:baa4ccec230e2f3cf640afb857188238956bc1990aa63e59bc596dc4de42da0d",
+		Digest: "sha256:d905c03ac635172a96c12b8af6c90cfd028e3edaa3114b31a9e196ab38c16963",
 	}, {
 		Name: "Two files",
 		FileMap: map[string][]byte{
 			"/test": []byte("testy"),
 			"/bar":  []byte("not useful"),
 		},
-		Digest: "sha256:a6c773d2afa4fd7d8b429f013a2f23615571e97207391545a748e3546f9e1f46",
+		Digest: "sha256:20e7e4800e5eb167f170970936c08d9e1bcbe91372420eeb6ab8d1a07752c3a3",
 	}, {
 		Name: "Many files",
 		FileMap: map[string][]byte{
@@ -118,7 +118,7 @@ func TestImage(t *testing.T) {
 			"/8": []byte("8"),
 			"/9": []byte("9"),
 		},
-		Digest: "sha256:c2ee9d5aba32d42088ac5561e5f8bc9795a4abca2475264a4aa729fd1ee8ef22",
+		Digest: "sha256:dfca2803510c8e3b83a3151f7c035c60cfa2a8a52465b802e18b85014de361f1",
 	}}
 	for _, tc := range tcs {
 		t.Run(tc.Name, func(t *testing.T) {

pkg/legacy/config.go

@@ -23,6 +23,9 @@ import (
 // https://github.com/moby/moby/blob/master/image/spec/v1.md
 type LayerConfigFile struct {
 	v1.ConfigFile
+
+	ContainerConfig v1.Config `json:"container_config,omitempty"`
+
 	ID        string `json:"id,omitempty"`
 	Parent    string `json:"parent,omitempty"`
 	Throwaway bool   `json:"throwaway,omitempty"`

pkg/legacy/tarball/write.go

@@ -84,9 +84,9 @@ func newV1Layer(layer v1.Layer, parent *v1Layer, history v1.History) (*v1Layer,
 			ConfigFile: v1.ConfigFile{
 				Created: history.Created,
 				Author:  history.Author,
-				ContainerConfig: v1.Config{
-					Cmd: []string{history.CreatedBy},
-				},
+			},
+			ContainerConfig: v1.Config{
+				Cmd: []string{history.CreatedBy},
 			},
 			ID:        id,
 			Parent:    parentID,
@@ -113,7 +113,6 @@ func newTopV1Layer(layer v1.Layer, parent *v1Layer, history v1.History, imgConfi
 	result.config.DockerVersion = imgConfig.DockerVersion
 	result.config.OS = imgConfig.OS
 	result.config.Config = imgConfig.Config
-	result.config.ContainerConfig = imgConfig.ContainerConfig
 	result.config.Created = imgConfig.Created
 	return result, nil
 }

pkg/v1/config.go

@@ -24,17 +24,16 @@ import (
 // how to launch a container. See:
 // https://github.com/opencontainers/image-spec/blob/master/config.md
 type ConfigFile struct {
-	Architecture    string    `json:"architecture"`
-	Author          string    `json:"author,omitempty"`
-	Container       string    `json:"container,omitempty"`
-	Created         Time      `json:"created,omitempty"`
-	DockerVersion   string    `json:"docker_version,omitempty"`
-	History         []History `json:"history,omitempty"`
-	OS              string    `json:"os"`
-	RootFS          RootFS    `json:"rootfs"`
-	Config          Config    `json:"config"`
-	ContainerConfig Config    `json:"container_config,omitempty"`
-	OSVersion       string    `json:"osversion,omitempty"`
+	Architecture  string    `json:"architecture"`
+	Author        string    `json:"author,omitempty"`
+	Container     string    `json:"container,omitempty"`
+	Created       Time      `json:"created,omitempty"`
+	DockerVersion string    `json:"docker_version,omitempty"`
+	History       []History `json:"history,omitempty"`
+	OS            string    `json:"os"`
+	RootFS        RootFS    `json:"rootfs"`
+	Config        Config    `json:"config"`
+	OSVersion     string    `json:"osversion,omitempty"`
 }
 
 // History is one entry of a list recording how this container image was built.

pkg/v1/mutate/mutate.go

@@ -99,8 +99,6 @@ func Config(base v1.Image, cfg v1.Config) (v1.Image, error) {
 	}
 
 	cf.Config = cfg
-	// Downstream tooling expects these to match.
-	cf.ContainerConfig = cfg
 
 	return ConfigFile(base, cf)
 }
@@ -283,7 +281,6 @@ func Time(img v1.Image, t time.Time) (v1.Image, error) {
 
 	// Copy basic config over
 	cfg.Config = ocf.Config
-	cfg.ContainerConfig = ocf.Config // Downstream tooling expects these to match.
 
 	// Strip away timestamps from the config file
 	cfg.Created = v1.Time{Time: t}
@@ -363,7 +360,6 @@ func Canonical(img v1.Image) (v1.Image, error) {
 
 	cfg.Container = ""
 	cfg.Config.Hostname = ""
-	cfg.ContainerConfig.Hostname = ""
 	cfg.DockerVersion = ""
 
 	return ConfigFile(img, cfg)

pkg/v1/mutate/mutate_test.go

@@ -357,7 +357,7 @@ func TestAppendStreamableLayer(t *testing.T) {
 	if err != nil {
 		t.Errorf("Digest: %v", err)
 	}
-	wantDigest := "sha256:3ce401493b0faa0f0640afb50975aba3c3f8cc237ff17a5b3a0720dea5514eb7"
+	wantDigest := "sha256:14d140947afedc6901b490265a08bc8ebe7f9d9faed6fdf19a451f054a7dd746"
 	if h.String() != wantDigest {
 		t.Errorf("Image digest got %q, want %q", h, wantDigest)
 	}
@@ -377,7 +377,6 @@ func TestCanonical(t *testing.T) {
 	for _, s := range []string{
 		cf.Container,
 		cf.Config.Hostname,
-		cf.ContainerConfig.Hostname,
 		cf.DockerVersion,
 	} {
 		if s != "" {