daemon/containerd: rename some vars that collided with imports

thaJeztah · thaJeztah · commit e10eca3d1a57 · 2023-08-29T12:54:36.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go
@@ -42,14 +42,14 @@ import (
 // releasableLayer.Release() to prevent leaking of layers.
 func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {
 	if refOrID == "" { // from SCRATCH
-		os := runtime.GOOS
+		imgOS := runtime.GOOS
 		if runtime.GOOS == "windows" {
-			os = "linux"
+			imgOS = "linux"
 		}
 		if opts.Platform != nil {
-			os = opts.Platform.OS
+			imgOS = opts.Platform.OS
 		}
-		if !system.IsOSSupported(os) {
+		if !system.IsOSSupported(imgOS) {
 			return nil, nil, system.ErrNotSupportedOperatingSystem
 		}
 		return nil, &rolayer{
@@ -390,12 +390,12 @@ func (i *ImageService) CreateImage(ctx context.Context, config []byte, parent st
 		return nil, err
 	}
 
-	rootfs := ocispec.RootFS{
+	rootFS := ocispec.RootFS{
 		Type:    imgToCreate.RootFS.Type,
 		DiffIDs: []digest.Digest{},
 	}
 	for _, diffId := range imgToCreate.RootFS.DiffIDs {
-		rootfs.DiffIDs = append(rootfs.DiffIDs, digest.Digest(diffId))
+		rootFS.DiffIDs = append(rootFS.DiffIDs, digest.Digest(diffId))
 	}
 	exposedPorts := make(map[string]struct{}, len(imgToCreate.Config.ExposedPorts))
 	for k, v := range imgToCreate.Config.ExposedPorts {
@@ -424,7 +424,7 @@ func (i *ImageService) CreateImage(ctx context.Context, config []byte, parent st
 			Labels:       imgToCreate.Config.Labels,
 			StopSignal:   imgToCreate.Config.StopSignal,
 		},
-		RootFS:  rootfs,
+		RootFS:  rootFS,
 		History: imgToCreate.History,
 	}
 
diff --git a/daemon/containerd/image_import.go b/daemon/containerd/image_import.go
@@ -259,9 +259,9 @@ func compressAndWriteBlob(ctx context.Context, cs content.Store, compression arc
 	writeChan := make(chan digest.Digest)
 	// Start copying the blob to the content store from the pipe.
 	go func() {
-		digest, err := writeBlobAndReturnDigest(ctx, cs, mediaType, pr)
+		dgst, err := writeBlobAndReturnDigest(ctx, cs, mediaType, pr)
 		pr.CloseWithError(err)
-		writeChan <- digest
+		writeChan <- dgst
 	}()
 
 	// Copy archive to the pipe and tee it to a digester.

Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@ import (`
`42`	`42`	`// releasableLayer.Release() to prevent leaking of layers.`
`43`	`43`	`func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {`
`44`	`44`	`if refOrID == "" { // from SCRATCH`
`45`		`- os := runtime.GOOS`
	`45`	`+ imgOS := runtime.GOOS`
`46`	`46`	`if runtime.GOOS == "windows" {`
`47`		`- os = "linux"`
	`47`	`+ imgOS = "linux"`
`48`	`48`	`}`
`49`	`49`	`if opts.Platform != nil {`
`50`		`- os = opts.Platform.OS`
	`50`	`+ imgOS = opts.Platform.OS`
`51`	`51`	`}`
`52`		`- if !system.IsOSSupported(os) {`
	`52`	`+ if !system.IsOSSupported(imgOS) {`
`53`	`53`	`return nil, nil, system.ErrNotSupportedOperatingSystem`
`54`	`54`	`}`
`55`	`55`	`return nil, &rolayer{`
`@@ -390,12 +390,12 @@ func (i *ImageService) CreateImage(ctx context.Context, config []byte, parent st`
`390`	`390`	`return nil, err`
`391`	`391`	`}`
`392`	`392`
`393`		`- rootfs := ocispec.RootFS{`
	`393`	`+ rootFS := ocispec.RootFS{`
`394`	`394`	`Type: imgToCreate.RootFS.Type,`
`395`	`395`	`DiffIDs: []digest.Digest{},`
`396`	`396`	`}`
`397`	`397`	`for _, diffId := range imgToCreate.RootFS.DiffIDs {`
`398`		`- rootfs.DiffIDs = append(rootfs.DiffIDs, digest.Digest(diffId))`
	`398`	`+ rootFS.DiffIDs = append(rootFS.DiffIDs, digest.Digest(diffId))`
`399`	`399`	`}`
`400`	`400`	`exposedPorts := make(map[string]struct{}, len(imgToCreate.Config.ExposedPorts))`
`401`	`401`	`for k, v := range imgToCreate.Config.ExposedPorts {`
`@@ -424,7 +424,7 @@ func (i *ImageService) CreateImage(ctx context.Context, config []byte, parent st`
`424`	`424`	`Labels: imgToCreate.Config.Labels,`
`425`	`425`	`StopSignal: imgToCreate.Config.StopSignal,`
`426`	`426`	`},`
`427`		`- RootFS: rootfs,`
	`427`	`+ RootFS: rootFS,`
`428`	`428`	`History: imgToCreate.History,`
`429`	`429`	`}`
`430`	`430`