Merge 81380b9268 into 9861ce90fd

.github/workflows/e2e.yml

@@ -75,7 +75,7 @@ jobs:
           TESTFLAGS: -coverprofile=/tmp/coverage/coverage.txt
       -
         name: Send to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
         with:
-          files: ./build/coverage/coverage.txt
+          file: ./build/coverage/coverage.txt
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/test.yml

@@ -40,9 +40,9 @@ jobs:
           targets: test-coverage
       -
         name: Send to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
         with:
-          files: ./build/coverage/coverage.txt
+          file: ./build/coverage/coverage.txt
           token: ${{ secrets.CODECOV_TOKEN }}
 
   host:
@@ -78,8 +78,8 @@ jobs:
         shell: bash
       -
         name: Send to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
         with:
-          files: /tmp/coverage.txt
+          file: /tmp/coverage.txt
           working-directory: ${{ env.GOPATH }}/src/github.com/docker/cli
           token: ${{ secrets.CODECOV_TOKEN }}

Dockerfile

@@ -6,7 +6,7 @@ ARG BASE_DEBIAN_DISTRO=bookworm
 
 ARG GO_VERSION=1.23.3
 ARG XX_VERSION=1.5.0
-ARG GOVERSIONINFO_VERSION=v1.4.1
+ARG GOVERSIONINFO_VERSION=v1.3.0
 ARG GOTESTSUM_VERSION=v1.10.0
 ARG BUILDX_VERSION=0.18.0
 ARG COMPOSE_VERSION=v2.30.3

cli/command/container/stats.go

@@ -287,26 +287,16 @@ func RunStats(ctx context.Context, dockerCLI command.Cli, options *StatsOptions)
 		cStats.mu.RUnlock()
 
 		if !options.NoStream {
-			// Start by moving the cursor to the top-left
+			// Start by clearing the screen and moving the cursor to the top-left
-			_, _ = fmt.Fprint(&statsTextBuffer, "\033[H")
+			_, _ = fmt.Fprint(&statsTextBuffer, "\033[2J\033[H")
 		}
 
 		if err = statsFormatWrite(statsCtx, ccStats, daemonOSType, !options.NoTrunc); err != nil {
 			break
 		}
 
-		if !options.NoStream {
-			for _, line := range strings.Split(statsTextBuffer.String(), "\n") {
-				// In case the new text is shorter than the one we are writing over,
-				// we'll append the "erase line" escape sequence to clear the remaining text.
-				_, _ = fmt.Fprint(&statsTextBuffer, line, "\033[K\n")
-			}
-
-			// We might have fewer containers than before, so let's clear the remaining text
-			_, _ = fmt.Fprint(&statsTextBuffer, "\033[J")
-		}
-
 		_, _ = fmt.Fprint(dockerCLI.Out(), statsTextBuffer.String())
+
 		statsTextBuffer.Reset()
 
 		if len(cStats.cs) == 0 && !showAll {

cli/command/image/load.go

@@ -78,8 +78,7 @@ func runLoad(ctx context.Context, dockerCli command.Cli, opts loadOptions) error
 		if err != nil {
 			return errors.Wrap(err, "invalid platform")
 		}
-		// TODO(thaJeztah): change flag-type to support multiple platforms.
+		options.Platform = &p
-		options.Platforms = append(options.Platforms, p)
 	}
 
 	response, err := dockerCli.Client().ImageLoad(ctx, input, options)

cli/command/image/load_test.go

@@ -109,7 +109,7 @@ func TestNewLoadCommandSuccess(t *testing.T) {
 			name: "with platform",
 			args: []string{"--platform", "linux/amd64"},
 			imageLoadFunc: func(input io.Reader, options image.LoadOptions) (image.LoadResponse, error) {
-				assert.Check(t, is.DeepEqual([]ocispec.Platform{{OS: "linux", Architecture: "amd64"}}, options.Platforms))
+				assert.Check(t, is.DeepEqual(ocispec.Platform{OS: "linux", Architecture: "amd64"}, *options.Platform))
 				return image.LoadResponse{Body: io.NopCloser(strings.NewReader("Success"))}, nil
 			},
 		},

cli/command/image/save.go

@@ -63,8 +63,7 @@ func RunSave(ctx context.Context, dockerCli command.Cli, opts saveOptions) error
 		if err != nil {
 			return errors.Wrap(err, "invalid platform")
 		}
-		// TODO(thaJeztah): change flag-type to support multiple platforms.
+		options.Platform = &p
-		options.Platforms = append(options.Platforms, p)
 	}
 
 	responseBody, err := dockerCli.Client().ImageSave(ctx, opts.images, options)

cli/command/image/save_test.go

@@ -106,7 +106,7 @@ func TestNewSaveCommandSuccess(t *testing.T) {
 			imageSaveFunc: func(images []string, options image.SaveOptions) (io.ReadCloser, error) {
 				assert.Assert(t, is.Len(images, 1))
 				assert.Check(t, is.Equal("arg1", images[0]))
-				assert.Check(t, is.DeepEqual([]ocispec.Platform{{OS: "linux", Architecture: "amd64"}}, options.Platforms))
+				assert.Check(t, is.DeepEqual(ocispec.Platform{OS: "linux", Architecture: "amd64"}, *options.Platform))
 				return io.NopCloser(strings.NewReader("")), nil
 			},
 		},

dockerfiles/Dockerfile.lint

@@ -2,7 +2,7 @@
 
 ARG GO_VERSION=1.23.3
 ARG ALPINE_VERSION=3.20
-ARG GOLANGCI_LINT_VERSION=v1.62.0
+ARG GOLANGCI_LINT_VERSION=v1.61.0
 
 FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
 

vendor.mod

@@ -13,20 +13,20 @@ require (
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli-docs-tool v0.8.0
 	github.com/docker/distribution v2.8.3+incompatible
-	github.com/docker/docker v27.0.2-0.20241120142749-e5c2b5e10d68+incompatible // master (v-next)
+	github.com/docker/docker v27.0.2-0.20241031194140-6ac445c42bad+incompatible // master (v-next)
 	github.com/docker/docker-credential-helpers v0.8.2
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
 	github.com/fvbommel/sortorder v1.1.0
 	github.com/go-jose/go-jose/v4 v4.0.4
-	github.com/go-viper/mapstructure/v2 v2.2.1
+	github.com/go-viper/mapstructure/v2 v2.0.0
 	github.com/gogo/protobuf v1.3.2
 	github.com/google/go-cmp v0.6.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/mattn/go-runewidth v0.0.15
 	github.com/moby/patternmatcher v0.6.0
 	github.com/moby/swarmkit/v2 v2.0.0-20241017191044-e8ecf83ee08e
-	github.com/moby/sys/capability v0.4.0
+	github.com/moby/sys/capability v0.3.0
 	github.com/moby/sys/sequential v0.6.0
 	github.com/moby/sys/signal v0.7.1
 	github.com/moby/term v0.5.0
@@ -39,7 +39,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a
-	github.com/tonistiigi/go-rosetta v0.0.0-20220804170347-3f4430f2d346
+	github.com/tonistiigi/go-rosetta v0.0.0-20200727161949-f79598599c5d
 	github.com/xeipuuv/gojsonschema v1.2.0
 	go.opentelemetry.io/otel v1.28.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0

vendor.sum

@@ -51,8 +51,8 @@ github.com/docker/cli-docs-tool v0.8.0/go.mod h1:8TQQ3E7mOXoYUs811LiPdUnAhXrcVsB
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v27.0.2-0.20241120142749-e5c2b5e10d68+incompatible h1:ZWh4HhdUCagAd3S+gsFPOobHbc562obYFSrz3irGSsU=
+github.com/docker/docker v27.0.2-0.20241031194140-6ac445c42bad+incompatible h1:kSQ4U+63JfFxIOrTo6wMW1mqkOkPpiTe/7ZfvUdNLVE=
-github.com/docker/docker v27.0.2-0.20241120142749-e5c2b5e10d68+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.0.2-0.20241031194140-6ac445c42bad+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
@@ -89,8 +89,8 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc=
-github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -168,8 +168,8 @@ github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkV
 github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/swarmkit/v2 v2.0.0-20241017191044-e8ecf83ee08e h1:1yC8fRqStY6NirU/swI74fsrHvZVMbtxsHcvl8YpzDg=
 github.com/moby/swarmkit/v2 v2.0.0-20241017191044-e8ecf83ee08e/go.mod h1:mTTGIAz/59OGZR5Qe+QByIe3Nxc+sSuJkrsStFhr6Lg=
-github.com/moby/sys/capability v0.4.0 h1:4D4mI6KlNtWMCM1Z/K0i7RV1FkX+DBDHKVJpCndZoHk=
+github.com/moby/sys/capability v0.3.0 h1:kEP+y6te0gEXIaeQhIi0s7vKs/w0RPoH1qPa6jROcVg=
-github.com/moby/sys/capability v0.4.0/go.mod h1:4g9IK291rVkms3LKCDOoYlnV8xKwoDTpIrNEE35Wq0I=
+github.com/moby/sys/capability v0.3.0/go.mod h1:4g9IK291rVkms3LKCDOoYlnV8xKwoDTpIrNEE35Wq0I=
 github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
 github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
 github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0=
@@ -266,8 +266,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a h1:tlJ7tGUHvcvL1v3yR6NcCc9nOqh2L+CG6HWrYQtwzQ0=
 github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a/go.mod h1:Y94A6rPp2OwNfP/7vmf8O2xx2IykP8pPXQ1DLouGnEw=
-github.com/tonistiigi/go-rosetta v0.0.0-20220804170347-3f4430f2d346 h1:TvtdmeYsYEij78hS4oxnwikoiLdIrgav3BA+CbhaDAI=
+github.com/tonistiigi/go-rosetta v0.0.0-20200727161949-f79598599c5d h1:wvQZpqy8p0D/FUia6ipKDhXrzPzBVJE4PZyPc5+5Ay0=
-github.com/tonistiigi/go-rosetta v0.0.0-20220804170347-3f4430f2d346/go.mod h1:xKQhd7snlzKFuUi1taTGWjpRE8iFTA06DeacYi3CVFQ=
+github.com/tonistiigi/go-rosetta v0.0.0-20200727161949-f79598599c5d/go.mod h1:xKQhd7snlzKFuUi1taTGWjpRE8iFTA06DeacYi3CVFQ=
 github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b h1:FsyNrX12e5BkplJq7wKOLk0+C6LZ+KGXvuEcKUYm5ss=
 github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=

vendor/github.com/docker/docker/api/swagger.yaml

@@ -1991,18 +1991,6 @@ definitions:
         type: "string"
         x-nullable: false
         example: "sha256:ec3f0931a6e6b6855d76b2d7b0be30e81860baccd891b2e243280bf1cd8ad710"
-      Descriptor:
-        description: |
-          Descriptor is an OCI descriptor of the image target.
-          In case of a multi-platform image, this descriptor points to the OCI index
-          or a manifest list.
-
-          This field is only present if the daemon provides a multi-platform image store.
-
-          WARNING: This is experimental and may change at any time without any backward
-          compatibility.
-        x-nullable: true
-        $ref: "#/definitions/OCIDescriptor"
       RepoTags:
         description: |
           List of image names/tags in the local image cache that reference this
@@ -2290,18 +2278,6 @@ definitions:
         x-omitempty: true
         items:
           $ref: "#/definitions/ImageManifestSummary"
-      Descriptor:
-        description: |
-          Descriptor is an OCI descriptor of the image target.
-          In case of a multi-platform image, this descriptor points to the OCI index
-          or a manifest list.
-
-          This field is only present if the daemon provides a multi-platform image store.
-
-          WARNING: This is experimental and may change at any time without any backward
-          compatibility.
-        x-nullable: true
-        $ref: "#/definitions/OCIDescriptor"
 
   AuthConfig:
     type: "object"
@@ -7266,14 +7242,6 @@ paths:
                 type: "string"
               Platform:
                 type: "string"
-              ImageManifestDescriptor:
-                $ref: "#/definitions/OCIDescriptor"
-                description: |
-                  OCI descriptor of the platform-specific manifest of the image
-                  the container was created from.
-
-                  Note: Only available if the daemon provides a multi-platform
-                  image store.
               MountLabel:
                 type: "string"
               ProcessLabel:
@@ -9242,14 +9210,9 @@ paths:
           type: "string"
           in: "query"
           description: |
-            JSON-encoded OCI platform to select the platform-variant.
+            JSON encoded OCI platform describing platform to show the history for.
-            If omitted, it defaults to any locally available platform,
+            If not provided, the host platform will be used. If it's not
-            prioritizing the daemon's host platform.
+            available, any present platform will be picked.
-
-            If the daemon provides a multi-platform image store, this selects
-            the platform-variant to show the history for. If the image is
-            a single-platform image, or if the multi-platform image does not
-            provide a variant matching the given platform, an error is returned.
 
             Example: `{"os": "linux", "architecture": "arm", "variant": "v5"}`
       tags: ["Image"]
@@ -9299,19 +9262,6 @@ paths:
             all tags of the given image that are present in the local image store
             are pushed.
           type: "string"
-        - name: "platform"
-          type: "string"
-          in: "query"
-          description: |
-            JSON-encoded OCI platform to select the platform-variant to push.
-            If not provided, all available variants will attempt to be pushed.
-
-            If the daemon provides a multi-platform image store, this selects
-            the platform-variant to push to the registry. If the image is
-            a single-platform image, or if the multi-platform image does not
-            provide a variant matching the given platform, an error is returned.
-
-            Example: `{"os": "linux", "architecture": "arm", "variant": "v5"}`
         - name: "X-Registry-Auth"
           in: "header"
           description: |
@@ -9321,6 +9271,11 @@ paths:
             details.
           type: "string"
           required: true
+        - name: "platform"
+          in: "query"
+          description: "Select a platform-specific manifest to be pushed. OCI platform (JSON encoded)"
+          type: "string"
+          x-nullable: true
       tags: ["Image"]
   /images/{name}/tag:
     post:

vendor/github.com/docker/docker/api/types/container/container.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/storage"
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 // PruneReport contains the response for Engine API:
@@ -172,6 +171,4 @@ type InspectResponse struct {
 	Mounts          []MountPoint
 	Config          *Config
 	NetworkSettings *NetworkSettings
-	// ImageManifestDescriptor is the descriptor of a platform-specific manifest of the image used to create the container.
-	ImageManifestDescriptor *ocispec.Descriptor `json:",omitempty"`
 }

vendor/github.com/docker/docker/api/types/container/hostconfig.go

@@ -10,7 +10,7 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/go-connections/nat"
-	"github.com/docker/go-units"
+	units "github.com/docker/go-units"
 )
 
 // CgroupnsMode represents the cgroup namespace mode of the container

vendor/github.com/docker/docker/api/types/image/image_inspect.go

@@ -3,7 +3,6 @@ package image
 import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/storage"
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 // RootFS returns Image's RootFS description including the layer IDs.
@@ -120,11 +119,4 @@ type InspectResponse struct {
 	//
 	// This information is local to the daemon, and not part of the image itself.
 	Metadata Metadata
-
-	// Descriptor is the OCI descriptor of the image target.
-	// It's only set if the daemon provides a multi-platform image store.
-	//
-	// WARNING: This is experimental and may change at any time without any backward
-	// compatibility.
-	Descriptor *ocispec.Descriptor `json:"Descriptor,omitempty"`
 }

vendor/github.com/docker/docker/api/types/image/opts.go

@@ -98,14 +98,12 @@ type LoadOptions struct {
 	// Quiet suppresses progress output
 	Quiet bool
 
-	// Platforms selects the platforms to load if the image is a
+	// Platform is a specific platform to load when the image is a multi-platform
-	// multi-platform image and has multiple variants.
+	Platform *ocispec.Platform
-	Platforms []ocispec.Platform
 }
 
 // SaveOptions holds parameters to save images.
 type SaveOptions struct {
-	// Platforms selects the platforms to save if the image is a
+	// Platform is a specific platform to save if the image is a multi-platform image.
-	// multi-platform image and has multiple variants.
+	Platform *ocispec.Platform
-	Platforms []ocispec.Platform
 }

vendor/github.com/docker/docker/api/types/image/summary.go

@@ -1,7 +1,5 @@
 package image
 
-import ocispec "github.com/opencontainers/image-spec/specs-go/v1"
-
 type Summary struct {
 
 	// Number of containers using this image. Includes both stopped and running
@@ -44,13 +42,6 @@ type Summary struct {
 	// Required: true
 	ParentID string `json:"ParentId"`
 
-	// Descriptor is the OCI descriptor of the image target.
-	// It's only set if the daemon provides a multi-platform image store.
-	//
-	// WARNING: This is experimental and may change at any time without any backward
-	// compatibility.
-	Descriptor *ocispec.Descriptor `json:"Descriptor,omitempty"`
-
 	// Manifests is a list of image manifests available in this image.  It
 	// provides a more detailed view of the platform-specific image manifests or
 	// other image-attached data like build attestations.

vendor/github.com/docker/docker/client/image_history.go

@@ -3,6 +3,7 @@ package client // import "github.com/docker/docker/client"
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"net/url"
 
 	"github.com/docker/docker/api/types/image"
@@ -10,26 +11,26 @@ import (
 
 // ImageHistory returns the changes in an image in history format.
 func (cli *Client) ImageHistory(ctx context.Context, imageID string, opts image.HistoryOptions) ([]image.HistoryResponseItem, error) {
-	query := url.Values{}
+	values := url.Values{}
 	if opts.Platform != nil {
 		if err := cli.NewVersionError(ctx, "1.48", "platform"); err != nil {
 			return nil, err
 		}
 
-		p, err := encodePlatform(opts.Platform)
+		p, err := json.Marshal(*opts.Platform)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("invalid platform: %v", err)
 		}
-		query.Set("platform", p)
+		values.Set("platform", string(p))
-	}
-
-	serverResp, err := cli.get(ctx, "/images/"+imageID+"/history", query, nil)
-	defer ensureReaderClosed(serverResp)
-	if err != nil {
-		return nil, err
 	}
 
 	var history []image.HistoryResponseItem
+	serverResp, err := cli.get(ctx, "/images/"+imageID+"/history", values, nil)
+	defer ensureReaderClosed(serverResp)
+	if err != nil {
+		return history, err
+	}
+
 	err = json.NewDecoder(serverResp.body).Decode(&history)
 	return history, err
 }

vendor/github.com/docker/docker/client/image_import.go

@@ -21,18 +21,10 @@ func (cli *Client) ImageImport(ctx context.Context, source image.ImportSource, r
 	}
 
 	query := url.Values{}
-	if source.SourceName != "" {
 	query.Set("fromSrc", source.SourceName)
-	}
-	if ref != "" {
 	query.Set("repo", ref)
-	}
-	if options.Tag != "" {
 	query.Set("tag", options.Tag)
-	}
-	if options.Message != "" {
 	query.Set("message", options.Message)
-	}
 	if options.Platform != "" {
 		query.Set("platform", strings.ToLower(options.Platform))
 	}

vendor/github.com/docker/docker/client/image_load.go

@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
 
 import (
 	"context"
+	"encoding/json"
 	"io"
 	"net/http"
 	"net/url"
@@ -17,24 +18,24 @@ import (
 // the provided multi-platform image. This is only has effect if the input image
 // is a multi-platform image.
 func (cli *Client) ImageLoad(ctx context.Context, input io.Reader, opts image.LoadOptions) (image.LoadResponse, error) {
-	query := url.Values{}
+	v := url.Values{}
-	query.Set("quiet", "0")
+	v.Set("quiet", "0")
 	if opts.Quiet {
-		query.Set("quiet", "1")
+		v.Set("quiet", "1")
 	}
-	if len(opts.Platforms) > 0 {
+	if opts.Platform != nil {
 		if err := cli.NewVersionError(ctx, "1.48", "platform"); err != nil {
 			return image.LoadResponse{}, err
 		}
 
-		p, err := encodePlatforms(opts.Platforms...)
+		p, err := json.Marshal(*opts.Platform)
 		if err != nil {
 			return image.LoadResponse{}, err
 		}
-		query["platform"] = p
+		v.Set("platform", string(p))
 	}
 
-	resp, err := cli.postRaw(ctx, "/images/load", query, input, http.Header{
+	resp, err := cli.postRaw(ctx, "/images/load", v, input, http.Header{
 		"Content-Type": {"application/x-tar"},
 	})
 	if err != nil {

vendor/github.com/docker/docker/client/image_save.go

@@ -2,6 +2,8 @@ package client // import "github.com/docker/docker/client"
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
 	"io"
 	"net/url"
 
@@ -15,15 +17,16 @@ func (cli *Client) ImageSave(ctx context.Context, imageIDs []string, opts image.
 		"names": imageIDs,
 	}
 
-	if len(opts.Platforms) > 0 {
+	if opts.Platform != nil {
 		if err := cli.NewVersionError(ctx, "1.48", "platform"); err != nil {
 			return nil, err
 		}
-		p, err := encodePlatforms(opts.Platforms...)
+
+		p, err := json.Marshal(*opts.Platform)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("invalid platform: %v", err)
 		}
-		query["platform"] = p
+		query.Set("platform", string(p))
 	}
 
 	resp, err := cli.get(ctx, "/images/get", query, nil)

vendor/github.com/docker/docker/client/utils.go

@@ -1,14 +1,10 @@
 package client // import "github.com/docker/docker/client"
 
 import (
-	"encoding/json"
-	"fmt"
 	"net/url"
 	"regexp"
 
 	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/errdefs"
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 var headerRegexp = regexp.MustCompile(`\ADocker/.+\s\((.+)\)\z`)
@@ -36,43 +32,3 @@ func getFiltersQuery(f filters.Args) (url.Values, error) {
 	}
 	return query, nil
 }
-
-// encodePlatforms marshals the given platform(s) to JSON format, to
-// be used for query-parameters for filtering / selecting platforms.
-func encodePlatforms(platform ...ocispec.Platform) ([]string, error) {
-	if len(platform) == 0 {
-		return []string{}, nil
-	}
-	if len(platform) == 1 {
-		p, err := encodePlatform(&platform[0])
-		if err != nil {
-			return nil, err
-		}
-		return []string{p}, nil
-	}
-
-	seen := make(map[string]struct{}, len(platform))
-	out := make([]string, 0, len(platform))
-	for i := range platform {
-		p, err := encodePlatform(&platform[i])
-		if err != nil {
-			return nil, err
-		}
-		if _, ok := seen[p]; !ok {
-			out = append(out, p)
-			seen[p] = struct{}{}
-		}
-	}
-	return out, nil
-}
-
-// encodePlatforms marshals the given platform to JSON format, to
-// be used for query-parameters for filtering / selecting platforms. It
-// is used as a helper for encodePlatforms,
-func encodePlatform(platform *ocispec.Platform) (string, error) {
-	p, err := json.Marshal(platform)
-	if err != nil {
-		return "", errdefs.InvalidParameter(fmt.Errorf("invalid platform: %v", err))
-	}
-	return string(p), nil
-}

vendor/github.com/docker/docker/pkg/archive/changes_linux.go

@@ -261,13 +261,13 @@ func readdirnames(dirname string) (names []nameIno, err error) {
 func parseDirent(buf []byte, names []nameIno) (consumed int, newnames []nameIno) {
 	origlen := len(buf)
 	for len(buf) > 0 {
-		dirent := (*unix.Dirent)(unsafe.Pointer(&buf[0])) // #nosec G103 -- Ignore "G103: Use of unsafe calls should be audited"
+		dirent := (*unix.Dirent)(unsafe.Pointer(&buf[0]))
 		buf = buf[dirent.Reclen:]
 		if dirent.Ino == 0 { // File absent in directory.
 			continue
 		}
-		b := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0])) // #nosec G103 -- Ignore "G103: Use of unsafe calls should be audited"
+		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		name := string(b[0:clen(b[:])])
+		name := string(bytes[0:clen(bytes[:])])
 		if name == "." || name == ".." { // Useless names
 			continue
 		}

vendor/github.com/docker/docker/pkg/idtools/idtools.go

@@ -22,11 +22,11 @@ type subIDRange struct {
 	Length int
 }
 
-type subIDRanges []subIDRange
+type ranges []subIDRange
 
-func (e subIDRanges) Len() int           { return len(e) }
+func (e ranges) Len() int           { return len(e) }
-func (e subIDRanges) Swap(i, j int)      { e[i], e[j] = e[j], e[i] }
+func (e ranges) Swap(i, j int)      { e[i], e[j] = e[j], e[i] }
-func (e subIDRanges) Less(i, j int) bool { return e[i].Start < e[j].Start }
+func (e ranges) Less(i, j int) bool { return e[i].Start < e[j].Start }
 
 const (
 	subuidFileName = "/etc/subuid"
@@ -162,7 +162,7 @@ func (i IdentityMapping) Empty() bool {
 	return len(i.UIDMaps) == 0 && len(i.GIDMaps) == 0
 }
 
-func createIDMap(subidRanges subIDRanges) []IDMap {
+func createIDMap(subidRanges ranges) []IDMap {
 	idMap := []IDMap{}
 
 	containerID := 0
@@ -177,19 +177,19 @@ func createIDMap(subidRanges subIDRanges) []IDMap {
 	return idMap
 }
 
-func parseSubuid(username string) (subIDRanges, error) {
+func parseSubuid(username string) (ranges, error) {
 	return parseSubidFile(subuidFileName, username)
 }
 
-func parseSubgid(username string) (subIDRanges, error) {
+func parseSubgid(username string) (ranges, error) {
 	return parseSubidFile(subgidFileName, username)
 }
 
 // parseSubidFile will read the appropriate file (/etc/subuid or /etc/subgid)
-// and return all found subIDRanges for a specified username. If the special value
+// and return all found ranges for a specified username. If the special value
-// "ALL" is supplied for username, then all subIDRanges in the file will be returned
+// "ALL" is supplied for username, then all ranges in the file will be returned
-func parseSubidFile(path, username string) (subIDRanges, error) {
+func parseSubidFile(path, username string) (ranges, error) {
-	var rangeList subIDRanges
+	var rangeList ranges
 
 	subidFile, err := os.Open(path)
 	if err != nil {

vendor/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go

@@ -145,7 +145,7 @@ func findNextGIDRange() (int, error) {
 	return findNextRangeStart(ranges)
 }
 
-func findNextRangeStart(rangeList subIDRanges) (int, error) {
+func findNextRangeStart(rangeList ranges) (int, error) {
 	startID := defaultRangeStart
 	for _, arange := range rangeList {
 		if wouldOverlap(arange, startID) {

vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/go-units"
+	units "github.com/docker/go-units"
 	"github.com/moby/term"
 	"github.com/morikuni/aec"
 )

vendor/github.com/docker/docker/pkg/system/init_windows.go

@@ -3,8 +3,8 @@ package system // import "github.com/docker/docker/pkg/system"
 // containerdRuntimeSupported determines if containerd should be the runtime.
 var containerdRuntimeSupported = false
 
-// EnableContainerdRuntime sets whether to use containerd for runtime on Windows.
+// InitContainerdRuntime sets whether to use containerd for runtime on Windows.
-func EnableContainerdRuntime(cdPath string) {
+func InitContainerdRuntime(cdPath string) {
 	if len(cdPath) > 0 {
 		containerdRuntimeSupported = true
 	}

vendor/github.com/go-viper/mapstructure/v2/decode_hooks.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"net/netip"
-	"net/url"
 	"reflect"
 	"strconv"
 	"strings"
@@ -37,30 +36,6 @@ func typedDecodeHook(h DecodeHookFunc) DecodeHookFunc {
 	return nil
 }
 
-// cachedDecodeHook takes a raw DecodeHookFunc (an interface{}) and turns
-// it into a closure to be used directly
-// if the type fails to convert we return a closure always erroring to keep the previous behaviour
-func cachedDecodeHook(raw DecodeHookFunc) func(from reflect.Value, to reflect.Value) (interface{}, error) {
-	switch f := typedDecodeHook(raw).(type) {
-	case DecodeHookFuncType:
-		return func(from reflect.Value, to reflect.Value) (interface{}, error) {
-			return f(from.Type(), to.Type(), from.Interface())
-		}
-	case DecodeHookFuncKind:
-		return func(from reflect.Value, to reflect.Value) (interface{}, error) {
-			return f(from.Kind(), to.Kind(), from.Interface())
-		}
-	case DecodeHookFuncValue:
-		return func(from reflect.Value, to reflect.Value) (interface{}, error) {
-			return f(from, to)
-		}
-	default:
-		return func(from reflect.Value, to reflect.Value) (interface{}, error) {
-			return nil, errors.New("invalid decode hook signature")
-		}
-	}
-}
-
 // DecodeHookExec executes the given decode hook. This should be used
 // since it'll naturally degrade to the older backwards compatible DecodeHookFunc
 // that took reflect.Kind instead of reflect.Type.
@@ -86,17 +61,13 @@ func DecodeHookExec(
 // The composed funcs are called in order, with the result of the
 // previous transformation.
 func ComposeDecodeHookFunc(fs ...DecodeHookFunc) DecodeHookFunc {
-	cached := make([]func(from reflect.Value, to reflect.Value) (interface{}, error), 0, len(fs))
-	for _, f := range fs {
-		cached = append(cached, cachedDecodeHook(f))
-	}
 	return func(f reflect.Value, t reflect.Value) (interface{}, error) {
 		var err error
 		data := f.Interface()
 
 		newFrom := f
-		for _, c := range cached {
+		for _, f1 := range fs {
-			data, err = c(newFrom, t)
+			data, err = DecodeHookExec(f1, newFrom, t)
 			if err != nil {
 				return nil, err
 			}
@@ -110,17 +81,13 @@ func ComposeDecodeHookFunc(fs ...DecodeHookFunc) DecodeHookFunc {
 // OrComposeDecodeHookFunc executes all input hook functions until one of them returns no error. In that case its value is returned.
 // If all hooks return an error, OrComposeDecodeHookFunc returns an error concatenating all error messages.
 func OrComposeDecodeHookFunc(ff ...DecodeHookFunc) DecodeHookFunc {
-	cached := make([]func(from reflect.Value, to reflect.Value) (interface{}, error), 0, len(ff))
-	for _, f := range ff {
-		cached = append(cached, cachedDecodeHook(f))
-	}
 	return func(a, b reflect.Value) (interface{}, error) {
 		var allErrs string
 		var out interface{}
 		var err error
 
-		for _, c := range cached {
+		for _, f := range ff {
-			out, err = c(a, b)
+			out, err = DecodeHookExec(f, a, b)
 			if err != nil {
 				allErrs += err.Error() + "\n"
 				continue
@@ -177,26 +144,6 @@ func StringToTimeDurationHookFunc() DecodeHookFunc {
 	}
 }
 
-// StringToURLHookFunc returns a DecodeHookFunc that converts
-// strings to *url.URL.
-func StringToURLHookFunc() DecodeHookFunc {
-	return func(
-		f reflect.Type,
-		t reflect.Type,
-		data interface{},
-	) (interface{}, error) {
-		if f.Kind() != reflect.String {
-			return data, nil
-		}
-		if t != reflect.TypeOf(&url.URL{}) {
-			return data, nil
-		}
-
-		// Convert it by parsing
-		return url.Parse(data.(string))
-	}
-}
-
 // StringToIPHookFunc returns a DecodeHookFunc that converts
 // strings to net.IP
 func StringToIPHookFunc() DecodeHookFunc {

vendor/github.com/go-viper/mapstructure/v2/mapstructure.go

@@ -266,10 +266,6 @@ type DecoderConfig struct {
 	// defaults to "mapstructure"
 	TagName string
 
-	// The option of the value in the tag that indicates a field should
-	// be squashed. This defaults to "squash".
-	SquashTagOption string
-
 	// IgnoreUntaggedFields ignores all struct fields without explicit
 	// TagName, comparable to `mapstructure:"-"` as default behaviour.
 	IgnoreUntaggedFields bool
@@ -278,10 +274,6 @@ type DecoderConfig struct {
 	// field name or tag. Defaults to `strings.EqualFold`. This can be used
 	// to implement case-sensitive tag values, support snake casing, etc.
 	MatchName func(mapKey, fieldName string) bool
-
-	// DecodeNil, if set to true, will cause the DecodeHook (if present) to run
-	// even if the input is nil. This can be used to provide default values.
-	DecodeNil bool
 }
 
 // A Decoder takes a raw interface value and turns it into structured
@@ -292,7 +284,6 @@ type DecoderConfig struct {
 // up the most basic Decoder.
 type Decoder struct {
 	config *DecoderConfig
-	cachedDecodeHook func(from reflect.Value, to reflect.Value) (interface{}, error)
 }
 
 // Metadata contains information about decoding a structure that
@@ -410,10 +401,6 @@ func NewDecoder(config *DecoderConfig) (*Decoder, error) {
 		config.TagName = "mapstructure"
 	}
 
-	if config.SquashTagOption == "" {
-		config.SquashTagOption = "squash"
-	}
-
 	if config.MatchName == nil {
 		config.MatchName = strings.EqualFold
 	}
@@ -421,9 +408,6 @@ func NewDecoder(config *DecoderConfig) (*Decoder, error) {
 	result := &Decoder{
 		config: config,
 	}
-	if config.DecodeHook != nil {
-		result.cachedDecodeHook = cachedDecodeHook(config.DecodeHook)
-	}
 
 	return result, nil
 }
@@ -442,26 +426,19 @@ func (d *Decoder) Decode(input interface{}) error {
 	return err
 }
 
-// isNil returns true if the input is nil or a typed nil pointer.
-func isNil(input interface{}) bool {
-	if input == nil {
-		return true
-	}
-	val := reflect.ValueOf(input)
-	return val.Kind() == reflect.Ptr && val.IsNil()
-}
-
 // Decodes an unknown data type into a specific reflection value.
 func (d *Decoder) decode(name string, input interface{}, outVal reflect.Value) error {
-	var (
+	var inputVal reflect.Value
+	if input != nil {
 		inputVal = reflect.ValueOf(input)
-		outputKind = getKind(outVal)
+
-		decodeNil  = d.config.DecodeNil && d.cachedDecodeHook != nil
+		// We need to check here if input is a typed nil. Typed nils won't
-	)
+		// match the "input == nil" below so we check that here.
-	if isNil(input) {
+		if inputVal.Kind() == reflect.Ptr && inputVal.IsNil() {
-		// Typed nils won't match the "input == nil" below, so reset input.
 			input = nil
 		}
+	}
+
 	if input == nil {
 		// If the data is nil, then we don't set anything, unless ZeroFields is set
 		// to true.
@@ -472,12 +449,10 @@ func (d *Decoder) decode(name string, input interface{}, outVal reflect.Value) e
 				d.config.Metadata.Keys = append(d.config.Metadata.Keys, name)
 			}
 		}
-		if !decodeNil {
 		return nil
 	}
-	}
+
 	if !inputVal.IsValid() {
-		if !decodeNil {
 		// If the input value is invalid, then we just set the value
 		// to be the zero value.
 		outVal.Set(reflect.Zero(outVal.Type()))
@@ -486,32 +461,18 @@ func (d *Decoder) decode(name string, input interface{}, outVal reflect.Value) e
 		}
 		return nil
 	}
-		// Hooks need a valid inputVal, so reset it to zero value of outVal type.
-		switch outputKind {
-		case reflect.Struct, reflect.Map:
-			var mapVal map[string]interface{}
-			inputVal = reflect.ValueOf(mapVal) // create nil map pointer
-		case reflect.Slice, reflect.Array:
-			var sliceVal []interface{}
-			inputVal = reflect.ValueOf(sliceVal) // create nil slice pointer
-		default:
-			inputVal = reflect.Zero(outVal.Type())
-		}
-	}
 
-	if d.cachedDecodeHook != nil {
+	if d.config.DecodeHook != nil {
 		// We have a DecodeHook, so let's pre-process the input.
 		var err error
-		input, err = d.cachedDecodeHook(inputVal, outVal)
+		input, err = DecodeHookExec(d.config.DecodeHook, inputVal, outVal)
 		if err != nil {
 			return fmt.Errorf("error decoding '%s': %w", name, err)
 		}
 	}
-	if isNil(input) {
-		return nil
-	}
 
 	var err error
+	outputKind := getKind(outVal)
 	addMetaKey := true
 	switch outputKind {
 	case reflect.Bool:
@@ -792,8 +753,8 @@ func (d *Decoder) decodeBool(name string, data interface{}, val reflect.Value) e
 		}
 	default:
 		return fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%#v', value: '%#v'",
+			"'%s' expected type '%s', got unconvertible type '%s', value: '%v'",
-			name, val, dataVal, data)
+			name, val.Type(), dataVal.Type(), data)
 	}
 
 	return nil
@@ -1012,7 +973,7 @@ func (d *Decoder) decodeMapFromStruct(name string, dataVal reflect.Value, val re
 			}
 
 			// If "squash" is specified in the tag, we squash the field down.
-			squash = squash || strings.Contains(tagValue[index+1:], d.config.SquashTagOption)
+			squash = squash || strings.Index(tagValue[index+1:], "squash") != -1
 			if squash {
 				// When squashing, the embedded type can be a pointer to a struct.
 				if v.Kind() == reflect.Ptr && v.Elem().Kind() == reflect.Struct {
@@ -1390,7 +1351,7 @@ func (d *Decoder) decodeStructFromMap(name string, dataVal, val reflect.Value) e
 			// We always parse the tags cause we're looking for other tags too
 			tagParts := strings.Split(fieldType.Tag.Get(d.config.TagName), ",")
 			for _, tag := range tagParts[1:] {
-				if tag == d.config.SquashTagOption {
+				if tag == "squash" {
 					squash = true
 					break
 				}
@@ -1402,15 +1363,10 @@ func (d *Decoder) decodeStructFromMap(name string, dataVal, val reflect.Value) e
 			}
 
 			if squash {
-				switch fieldVal.Kind() {
+				if fieldVal.Kind() != reflect.Struct {
-				case reflect.Struct:
-					structs = append(structs, fieldVal)
-				case reflect.Interface:
-					if !fieldVal.IsNil() {
-						structs = append(structs, fieldVal.Elem().Elem())
-					}
-				default:
 					errs = append(errs, fmt.Errorf("%s: unsupported type for squash: %s", fieldType.Name, fieldVal.Kind()))
+				} else {
+					structs = append(structs, fieldVal)
 				}
 				continue
 			}

vendor/github.com/moby/sys/capability/.codespellrc

@@ -0,0 +1,3 @@
+[codespell]
+skip = ./.git
+ignore-words-list = nd

vendor/github.com/moby/sys/capability/.golangci.yml

@@ -0,0 +1,6 @@
+linters:
+  enable:
+    - unconvert
+    - unparam
+    - gofumpt
+    - errorlint

vendor/github.com/moby/sys/capability/CHANGELOG.md

@@ -5,30 +5,6 @@ from https://github.com/syndtr/gocapability/commit/42c35b4376354fd5.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.4.0] - 2024-11-11
-
-### Added
-* New separate API for ambient ([GetAmbient], [SetAmbient], [ResetAmbient])
-  and bound ([GetBound], [DropBound]) capabilities, modelled after libcap. (#176)
-
-### Fixed
-* [Apply] now returns an error if called for non-zero `pid`. Before this change,
-  it could silently change some capabilities of the current process, instead of
-  the one identified by the `pid`. (#168, #174)
-* Fixed tests that change capabilities to be run in a separate process. (#173)
-* Other improvements in tests. (#169, #170)
-
-### Changed
-* Use raw syscalls (which are slightly faster). (#176)
-* Most tests are now limited to testing the public API of the package. (#162)
-* Simplify parsing /proc/*pid*/status, add a test case. (#162)
-* Optimize the number of syscall to set ambient capabilities in Apply
-  by clearing them first; add a test case. (#163, #164)
-* Better documentation for [Apply], [NewFile], [NewFile2], [NewPid], [NewPid2]. (#175)
-
-### Removed
-* `.golangci.yml` and `.codespellrc` are no longer part of the package. (#158)
-
 ## [0.3.0] - 2024-09-25
 
 ### Added
@@ -87,24 +63,14 @@ This is an initial release since the fork.
  * Removed init function so programs that use this package start faster. [#6]
  * Removed `CAP_LAST_CAP` (use [LastCap] instead). [#6]
 
-<!-- Doc links (please keep sorted). -->
+<!-- Doc links. -->
 [Apply]: https://pkg.go.dev/github.com/moby/sys/capability#Capabilities.Apply
-[DropBound]: https://pkg.go.dev/github.com/moby/sys/capability#DropBound
-[GetAmbient]: https://pkg.go.dev/github.com/moby/sys/capability#GetAmbient
-[GetBound]: https://pkg.go.dev/github.com/moby/sys/capability#GetBound
 [LastCap]: https://pkg.go.dev/github.com/moby/sys/capability#LastCap
+[List]: https://pkg.go.dev/github.com/moby/sys/capability#List
 [ListKnown]: https://pkg.go.dev/github.com/moby/sys/capability#ListKnown
 [ListSupported]: https://pkg.go.dev/github.com/moby/sys/capability#ListSupported
-[List]: https://pkg.go.dev/github.com/moby/sys/capability#List
-[NewFile2]: https://pkg.go.dev/github.com/moby/sys/capability#NewFile2
-[NewFile]: https://pkg.go.dev/github.com/moby/sys/capability#NewFile
-[NewPid2]: https://pkg.go.dev/github.com/moby/sys/capability#NewPid2
-[NewPid]: https://pkg.go.dev/github.com/moby/sys/capability#NewPid
-[ResetAmbient]: https://pkg.go.dev/github.com/moby/sys/capability#ResetAmbient
-[SetAmbient]: https://pkg.go.dev/github.com/moby/sys/capability#SetAmbient
 
 <!-- Minor releases. -->
-[0.4.0]: https://github.com/moby/sys/releases/tag/capability%2Fv0.4.0
 [0.3.0]: https://github.com/moby/sys/releases/tag/capability%2Fv0.3.0
 [0.2.0]: https://github.com/moby/sys/releases/tag/capability%2Fv0.2.0
 [0.1.1]: https://github.com/kolyshkin/capability/compare/v0.1.0...v0.1.1

vendor/github.com/moby/sys/capability/capability.go

@@ -56,16 +56,16 @@ type Capabilities interface {
 	// outstanding changes.
 	Load() error
 
-	// Apply apply the capabilities settings, so all changes made by
+	// Apply apply the capabilities settings, so all changes will take
-	// [Set], [Unset], [Fill], or [Clear] will take effect.
+	// effect.
 	Apply(kind CapType) error
 }
 
 // NewPid initializes a new [Capabilities] object for given pid when
 // it is nonzero, or for the current process if pid is 0.
 //
-// Deprecated: replace with [NewPid2] followed by optional [Capabilities.Load]
+// Deprecated: Replace with [NewPid2] followed by [Capabilities.Load].
-// (only if needed). For example, replace:
+// For example, replace:
 //
 //	c, err := NewPid(0)
 //	if err != nil {
@@ -93,16 +93,16 @@ func NewPid(pid int) (Capabilities, error) {
 
 // NewPid2 initializes a new [Capabilities] object for given pid when
 // it is nonzero, or for the current process if pid is 0. This
-// does not load the process's current capabilities; if needed,
+// does not load the process's current capabilities; to do that you
-// call [Capabilities.Load].
+// must call [Capabilities.Load] explicitly.
 func NewPid2(pid int) (Capabilities, error) {
 	return newPid(pid)
 }
 
 // NewFile initializes a new Capabilities object for given file path.
 //
-// Deprecated: replace with [NewFile2] followed by optional [Capabilities.Load]
+// Deprecated: Replace with [NewFile2] followed by [Capabilities.Load].
-// (only if needed). For example, replace:
+// For example, replace:
 //
 //	c, err := NewFile(path)
 //	if err != nil {
@@ -130,7 +130,7 @@ func NewFile(path string) (Capabilities, error) {
 
 // NewFile2 creates a new initialized [Capabilities] object for given
 // file path. This does not load the process's current capabilities;
-// if needed, call [Capabilities.Load].
+// to do that you must call [Capabilities.Load] explicitly.
 func NewFile2(path string) (Capabilities, error) {
 	return newFile(path)
 }
@@ -142,35 +142,3 @@ func NewFile2(path string) (Capabilities, error) {
 func LastCap() (Cap, error) {
 	return lastCap()
 }
-
-// GetAmbient determines if a specific ambient capability is raised in the
-// calling thread.
-func GetAmbient(c Cap) (bool, error) {
-	return getAmbient(c)
-}
-
-// SetAmbient raises or lowers specified ambient capabilities for the calling
-// thread. To complete successfully, the prevailing effective capability set
-// must have a raised CAP_SETPCAP. Further, to raise a specific ambient
-// capability the inheritable and permitted sets of the calling thread must
-// already contain the specified capability.
-func SetAmbient(raise bool, caps ...Cap) error {
-	return setAmbient(raise, caps...)
-}
-
-// ResetAmbient resets all of the ambient capabilities for the calling thread
-// to their lowered value.
-func ResetAmbient() error {
-	return resetAmbient()
-}
-
-// GetBound determines if a specific bounding capability is raised in the
-// calling thread.
-func GetBound(c Cap) (bool, error) {
-	return getBound(c)
-}
-
-// DropBound lowers the specified bounding set capability.
-func DropBound(caps ...Cap) error {
-	return dropBound(caps...)
-}

vendor/github.com/moby/sys/capability/capability_linux.go

@@ -117,13 +117,6 @@ func newPid(pid int) (c Capabilities, retErr error) {
 	return
 }
 
-func ignoreEINVAL(err error) error {
-	if errors.Is(err, syscall.EINVAL) {
-		err = nil
-	}
-	return err
-}
-
 type capsV3 struct {
 	hdr     capHeader
 	data    [2]capData
@@ -314,15 +307,15 @@ func (c *capsV3) Load() (err error) {
 			}
 			break
 		}
-		if val, ok := strings.CutPrefix(line, "CapBnd:\t"); ok {
+		if strings.HasPrefix(line, "CapB") {
-			_, err = fmt.Sscanf(val, "%08x%08x", &c.bounds[1], &c.bounds[0])
+			_, err = fmt.Sscanf(line[4:], "nd:  %08x%08x", &c.bounds[1], &c.bounds[0])
 			if err != nil {
 				break
 			}
 			continue
 		}
-		if val, ok := strings.CutPrefix(line, "CapAmb:\t"); ok {
+		if strings.HasPrefix(line, "CapA") {
-			_, err = fmt.Sscanf(val, "%08x%08x", &c.ambient[1], &c.ambient[0])
+			_, err = fmt.Sscanf(line[4:], "mb:  %08x%08x", &c.ambient[1], &c.ambient[0])
 			if err != nil {
 				break
 			}
@@ -334,10 +327,7 @@ func (c *capsV3) Load() (err error) {
 	return
 }
 
-func (c *capsV3) Apply(kind CapType) error {
+func (c *capsV3) Apply(kind CapType) (err error) {
-	if c.hdr.pid != 0 {
-		return errors.New("unable to modify capabilities of another process")
-	}
 	last, err := LastCap()
 	if err != nil {
 		return err
@@ -346,17 +336,21 @@ func (c *capsV3) Apply(kind CapType) error {
 		var data [2]capData
 		err = capget(&c.hdr, &data[0])
 		if err != nil {
-			return err
+			return
 		}
 		if (1<<uint(CAP_SETPCAP))&data[0].effective != 0 {
 			for i := Cap(0); i <= last; i++ {
 				if c.Get(BOUNDING, i) {
 					continue
 				}
-				// Ignore EINVAL since the capability may not be supported in this system.
+				err = prctl(syscall.PR_CAPBSET_DROP, uintptr(i), 0, 0, 0)
-				err = ignoreEINVAL(dropBound(i))
 				if err != nil {
-					return err
+					// Ignore EINVAL since the capability may not be supported in this system.
+					if err == syscall.EINVAL { //nolint:errorlint // Errors from syscall are bare.
+						err = nil
+						continue
+					}
+					return
 				}
 			}
 		}
@@ -365,73 +359,29 @@ func (c *capsV3) Apply(kind CapType) error {
 	if kind&CAPS == CAPS {
 		err = capset(&c.hdr, &c.data[0])
 		if err != nil {
-			return err
+			return
 		}
 	}
 
 	if kind&AMBS == AMBS {
-		// Ignore EINVAL as not supported on kernels before 4.3
-		err = ignoreEINVAL(resetAmbient())
-		if err != nil {
-			return err
-		}
 		for i := Cap(0); i <= last; i++ {
-			if !c.Get(AMBIENT, i) {
+			action := pr_CAP_AMBIENT_LOWER
+			if c.Get(AMBIENT, i) {
+				action = pr_CAP_AMBIENT_RAISE
+			}
+			err = prctl(pr_CAP_AMBIENT, action, uintptr(i), 0, 0)
+			if err != nil {
+				// Ignore EINVAL as not supported on kernels before 4.3
+				if err == syscall.EINVAL { //nolint:errorlint // Errors from syscall are bare.
+					err = nil
 					continue
 				}
-			// Ignore EINVAL as not supported on kernels before 4.3
+				return
-			err = ignoreEINVAL(setAmbient(true, i))
-			if err != nil {
-				return err
 			}
 		}
 	}
 
-	return nil
+	return
-}
-
-func getAmbient(c Cap) (bool, error) {
-	res, err := prctlRetInt(pr_CAP_AMBIENT, pr_CAP_AMBIENT_IS_SET, uintptr(c))
-	if err != nil {
-		return false, err
-	}
-	return res > 0, nil
-}
-
-func setAmbient(raise bool, caps ...Cap) error {
-	op := pr_CAP_AMBIENT_RAISE
-	if !raise {
-		op = pr_CAP_AMBIENT_LOWER
-	}
-	for _, val := range caps {
-		err := prctl(pr_CAP_AMBIENT, op, uintptr(val))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func resetAmbient() error {
-	return prctl(pr_CAP_AMBIENT, pr_CAP_AMBIENT_CLEAR_ALL, 0)
-}
-
-func getBound(c Cap) (bool, error) {
-	res, err := prctlRetInt(syscall.PR_CAPBSET_READ, uintptr(c), 0)
-	if err != nil {
-		return false, err
-	}
-	return res > 0, nil
-}
-
-func dropBound(caps ...Cap) error {
-	for _, val := range caps {
-		err := prctl(syscall.PR_CAPBSET_DROP, uintptr(val), 0)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
 }
 
 func newFile(path string) (c Capabilities, err error) {

vendor/github.com/moby/sys/capability/capability_noop.go

@@ -24,23 +24,3 @@ func newFile(_ string) (Capabilities, error) {
 func lastCap() (Cap, error) {
 	return -1, errNotSup
 }
-
-func getAmbient(_ Cap) (bool, error) {
-	return false, errNotSup
-}
-
-func setAmbient(_ bool, _ ...Cap) error {
-	return errNotSup
-}
-
-func resetAmbient() error {
-	return errNotSup
-}
-
-func getBound(_ Cap) (bool, error) {
-	return false, errNotSup
-}
-
-func dropBound(_ ...Cap) error {
-	return errNotSup
-}

vendor/github.com/moby/sys/capability/enum.go

@@ -316,7 +316,7 @@ func ListKnown() []Cap {
 	return list()
 }
 
-// ListSupported returns the list of all capabilities known to the package,
+// ListSupported retuns the list of all capabilities known to the package,
 // except those that are not supported by the currently running Linux kernel.
 func ListSupported() ([]Cap, error) {
 	last, err := LastCap()

vendor/github.com/moby/sys/capability/syscall_linux.go

@@ -24,7 +24,7 @@ type capData struct {
 }
 
 func capget(hdr *capHeader, data *capData) (err error) {
-	_, _, e1 := syscall.RawSyscall(syscall.SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
+	_, _, e1 := syscall.Syscall(syscall.SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -32,7 +32,7 @@ func capget(hdr *capHeader, data *capData) (err error) {
 }
 
 func capset(hdr *capHeader, data *capData) (err error) {
-	_, _, e1 := syscall.RawSyscall(syscall.SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
+	_, _, e1 := syscall.Syscall(syscall.SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -48,22 +48,14 @@ const (
 	pr_CAP_AMBIENT_CLEAR_ALL = uintptr(4)
 )
 
-func prctl(option int, arg2, arg3 uintptr) (err error) {
+func prctl(option int, arg2, arg3, arg4, arg5 uintptr) (err error) {
-	_, _, e1 := syscall.RawSyscall(syscall.SYS_PRCTL, uintptr(option), arg2, arg3)
+	_, _, e1 := syscall.Syscall6(syscall.SYS_PRCTL, uintptr(option), arg2, arg3, arg4, arg5, 0)
 	if e1 != 0 {
 		err = e1
 	}
 	return
 }
 
-func prctlRetInt(option int, arg2, arg3 uintptr) (int, error) {
-	ret, _, err := syscall.RawSyscall(syscall.SYS_PRCTL, uintptr(option), arg2, arg3)
-	if err != 0 {
-		return 0, err
-	}
-	return int(ret), nil
-}
-
 const (
 	vfsXattrName = "security.capability"
 
@@ -100,7 +92,7 @@ func getVfsCap(path string, dest *vfscapData) (err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := syscall.RawSyscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(dest)), vfscapDataSizeV2, 0, 0)
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(dest)), vfscapDataSizeV2, 0, 0)
 	if e1 != 0 {
 		if e1 == syscall.ENODATA {
 			dest.version = 2
@@ -153,7 +145,7 @@ func setVfsCap(path string, data *vfscapData) (err error) {
 	} else {
 		return syscall.EINVAL
 	}
-	_, _, e1 := syscall.RawSyscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(data)), size, 0, 0)
+	_, _, e1 := syscall.Syscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(data)), size, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}

vendor/github.com/tonistiigi/go-rosetta/README.md

@@ -1,8 +0,0 @@
-go-rosetta
-==========
-
-[![PkgGoDev](https://pkg.go.dev/badge/github.com/tonistiigi/go-rosetta)](https://pkg.go.dev/github.com/tonistiigi/go-rosetta)
-
-`go-rosetta` provides utilities to detect if an application is running as a
-[Rosetta](https://developer.apple.com/documentation/apple_silicon/about_the_rosetta_translation_environment) translated binary, and
-to determine the native architecture.

vendor/github.com/tonistiigi/go-rosetta/rosetta.go

@@ -1,28 +1,17 @@
-//go:build darwin
 // +build darwin
 
 package rosetta
 
 import (
-	"os"
 	"runtime"
 	"syscall"
 )
 
-// Available returns true if Rosetta is installed/available
-func Available() bool {
-	_, err := os.Stat("/Library/Apple/usr/share/rosetta")
-	return err == nil
-}
-
-// Enabled returns true if running in a Rosetta Translated Binary, false otherwise.
 func Enabled() bool {
 	v, err := syscall.SysctlUint32("sysctl.proc_translated")
 	return err == nil && v == 1
 }
 
-// NativeArch returns the native architecture, even if binary architecture
-// is emulated by Rosetta.
 func NativeArch() string {
 	if Enabled() && runtime.GOARCH == "amd64" {
 		return "arm64"

vendor/github.com/tonistiigi/go-rosetta/rosetta_unsupported.go

@@ -1,4 +1,3 @@
-//go:build !darwin
 // +build !darwin
 
 package rosetta
@@ -7,18 +6,10 @@ import (
 	"runtime"
 )
 
-// Available returns true if Rosetta is installed/available
-func Available() bool {
-	return false
-}
-
-// Enabled returns true if running in a Rosetta Translated Binary, false otherwise.
 func Enabled() bool {
 	return false
 }
 
-// NativeArch returns the native architecture, even if binary architecture
-// is emulated by Rosetta.
 func NativeArch() string {
 	return runtime.GOARCH
 }

vendor/modules.txt

@@ -55,7 +55,7 @@ github.com/docker/distribution/registry/client/transport
 github.com/docker/distribution/registry/storage/cache
 github.com/docker/distribution/registry/storage/cache/memory
 github.com/docker/distribution/uuid
-# github.com/docker/docker v27.0.2-0.20241120142749-e5c2b5e10d68+incompatible
+# github.com/docker/docker v27.0.2-0.20241031194140-6ac445c42bad+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types
@@ -136,7 +136,7 @@ github.com/go-logr/logr/funcr
 # github.com/go-logr/stdr v1.2.2
 ## explicit; go 1.16
 github.com/go-logr/stdr
-# github.com/go-viper/mapstructure/v2 v2.2.1
+# github.com/go-viper/mapstructure/v2 v2.0.0
 ## explicit; go 1.18
 github.com/go-viper/mapstructure/v2
 github.com/go-viper/mapstructure/v2/internal/errors
@@ -205,7 +205,7 @@ github.com/moby/swarmkit/v2/api/defaults
 github.com/moby/swarmkit/v2/api/genericresource
 github.com/moby/swarmkit/v2/manager/raftselector
 github.com/moby/swarmkit/v2/protobuf/plugin
-# github.com/moby/sys/capability v0.4.0
+# github.com/moby/sys/capability v0.3.0
 ## explicit; go 1.21
 github.com/moby/sys/capability
 # github.com/moby/sys/sequential v0.6.0
@@ -293,7 +293,7 @@ github.com/theupdateframework/notary/tuf/data
 github.com/theupdateframework/notary/tuf/signed
 github.com/theupdateframework/notary/tuf/utils
 github.com/theupdateframework/notary/tuf/validation
-# github.com/tonistiigi/go-rosetta v0.0.0-20220804170347-3f4430f2d346
+# github.com/tonistiigi/go-rosetta v0.0.0-20200727161949-f79598599c5d
 ## explicit; go 1.13
 github.com/tonistiigi/go-rosetta
 # github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb