1. docker
  2. Commit 8d4cb6e07168790c8eb4d976218ca70a3c31649d
Browse code

Merge pull request #51101 from thaJeztah/less_dockerversion

daemon: stop propagating Image.DockerVersion, Plugin.Config.DockerVersion fields

Sebastiaan van Stijn authored on 2025/10/07 20:01:13
Showing 5 changed files
daemon/containerd/imagespec.go
History View file @ 8d4cb6e
... ... 
@@ -7,7 +7,6 @@ import (
7 7 
 	"github.com/moby/moby/api/types/container"
8 8 
 	"github.com/moby/moby/api/types/network"
9 9 
 	"github.com/moby/moby/v2/daemon/internal/image"
10 
-	"github.com/moby/moby/v2/dockerversion"
11 10 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
12 11 
 )
13 12
... ... 
@@ -18,13 +17,12 @@ import (
18 18 
 // - Details
19 19 
 func dockerOciImageToDockerImagePartial(id image.ID, img dockerspec.DockerOCIImage) *image.Image {
20 20 
 	v1Image := image.V1Image{
21 
-		DockerVersion: dockerversion.Version,
22 
-		Config:        dockerOCIImageConfigToContainerConfig(img.Config),
23 
-		Architecture:  img.Platform.Architecture,
24 
-		Variant:       img.Platform.Variant,
25 
-		OS:            img.Platform.OS,
26 
-		Author:        img.Author,
27 
-		Created:       img.Created,
21 
+		Config:       dockerOCIImageConfigToContainerConfig(img.Config),
22 
+		Architecture: img.Platform.Architecture,
23 
+		Variant:      img.Platform.Variant,
24 
+		OS:           img.Platform.OS,
25 
+		Author:       img.Author,
26 
+		Created:      img.Created,
28 27 
 	}
29 28
30 29 
 	out := image.NewImage(id)
daemon/images/image_import.go
History View file @ 8d4cb6e
... ... 
@@ -14,7 +14,6 @@ import (
14 14 
 	"github.com/moby/moby/v2/daemon/builder/dockerfile"
15 15 
 	"github.com/moby/moby/v2/daemon/internal/image"
16 16 
 	"github.com/moby/moby/v2/daemon/internal/layer"
17 
-	"github.com/moby/moby/v2/dockerversion"
18 17 
 	"github.com/moby/moby/v2/errdefs"
19 18 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
20 19 
 )
... ... 
@@ -53,13 +52,12 @@ func (i *ImageService) ImportImage(ctx context.Context, newRef reference.Named,
53 53 
 	created := time.Now().UTC()
54 54 
 	imgConfig, err := json.Marshal(&image.Image{
55 55 
 		V1Image: image.V1Image{
56 
-			DockerVersion: dockerversion.Version,
57 
-			Config:        config,
58 
-			Architecture:  platform.Architecture,
59 
-			Variant:       platform.Variant,
60 
-			OS:            platform.OS,
61 
-			Created:       &created,
62 
-			Comment:       msg,
56 
+			Config:       config,
57 
+			Architecture: platform.Architecture,
58 
+			Variant:      platform.Variant,
59 
+			OS:           platform.OS,
60 
+			Created:      &created,
61 
+			Comment:      msg,
63 62 
 		},
64 63 
 		RootFS: &image.RootFS{
65 64 
 			Type:    "layers",
daemon/internal/image/cache/cache.go
History View file @ 8d4cb6e
... ... 
@@ -11,7 +11,6 @@ import (
11 11 
 	"github.com/moby/moby/v2/daemon/builder"
12 12 
 	"github.com/moby/moby/v2/daemon/internal/image"
13 13 
 	"github.com/moby/moby/v2/daemon/internal/layer"
14 
-	"github.com/moby/moby/v2/dockerversion"
15 14 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
16 15 
 	"github.com/pkg/errors"
17 16 
 )
... ... 
@@ -141,12 +140,11 @@ func (ic *ImageCache) restoreCachedImage(parent, target *image.Image, cfg *conta
141 141
142 142 
 	restoredImg := image.Image{
143 143 
 		V1Image: image.V1Image{
144 
-			DockerVersion: dockerversion.Version,
145 
-			Config:        cfg,
146 
-			Architecture:  target.Architecture,
147 
-			OS:            target.OS,
148 
-			Author:        target.Author,
149 
-			Created:       history[len(history)-1].Created,
144 
+			Config:       cfg,
145 
+			Architecture: target.Architecture,
146 
+			OS:           target.OS,
147 
+			Author:       target.Author,
148 
+			Created:      history[len(history)-1].Created,
150 149 
 		},
151 150 
 		RootFS:     rootFS,
152 151 
 		History:    history,
daemon/internal/image/image.go
History View file @ 8d4cb6e
... ... 
@@ -11,7 +11,6 @@ import (
11 11
12 12 
 	"github.com/moby/moby/api/types/container"
13 13 
 	"github.com/moby/moby/v2/daemon/internal/layer"
14 
-	"github.com/moby/moby/v2/dockerversion"
15 14 
 	"github.com/opencontainers/go-digest"
16 15 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
17 16 
 )
... ... 
@@ -236,7 +235,6 @@ func NewChildImage(img *Image, child ChildConfig, os string) *Image {
236 236
237 237 
 	return &Image{
238 238 
 		V1Image: V1Image{
239 
-			DockerVersion:   dockerversion.Version,
240 239 
 			Config:          child.Config,
241 240 
 			Architecture:    img.BaseImgArch(),
242 241 
 			Variant:         img.BaseImgVariant(),
daemon/pkg/plugin/backend_linux.go
History View file @ 8d4cb6e
... ... 
@@ -32,7 +32,6 @@ import (
32 32 
 	"github.com/moby/moby/v2/daemon/internal/stringid"
33 33 
 	v2 "github.com/moby/moby/v2/daemon/pkg/plugin/v2"
34 34 
 	"github.com/moby/moby/v2/daemon/server/backend"
35 
-	"github.com/moby/moby/v2/dockerversion"
36 35 
 	"github.com/moby/moby/v2/errdefs"
37 36 
 	"github.com/moby/moby/v2/pkg/authorization"
38 37 
 	"github.com/moby/moby/v2/pkg/pools"
... ... 
@@ -707,8 +706,6 @@ func (pm *Manager) CreateFromContext(ctx context.Context, tarCtx io.ReadCloser,
707 707 
 		DiffIds: []string{rootFSBlob.Digest().String()},
708 708 
 	}
709 709
710 
-	config.DockerVersion = dockerversion.Version //nolint:staticcheck // ignore SA1019: field is deprecated.
711 
-
712 710 
 	configBlob, err := pm.blobStore.Writer(ctx, content.WithRef(name+"-config.json"))
713 711 
 	if err != nil {
714 712 
 		return err