diff --git a/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch b/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch index e2c1af8..b5ddefa 100644 --- a/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch +++ b/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch @@ -1,4 +1,4 @@ -From 2e2fdee74ce8572ff90f213a444ece63248fa01c Mon Sep 17 00:00:00 2001 +From 2dedd52de834525fa533aba7854b91fdc783d821 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 8 Mar 2017 12:41:54 +1100 Subject: [PATCH 1/4] SECRETS: daemon: allow directory creation in /run/secrets @@ -69,5 +69,5 @@ index 290ec59a34a7..b7013fb89c83 100644 return errors.Wrap(err, "error setting ownership for secret") } -- -2.40.1 +2.42.0 diff --git a/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch b/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch index 4d558ed..627a272 100644 --- a/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch +++ b/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch @@ -1,4 +1,4 @@ -From bc80631658b8b9b94ca7cf7fc6b8234e6547e947 Mon Sep 17 00:00:00 2001 +From bd4c072521bdee906febc98d81ac092fcad8fc3b Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 8 Mar 2017 11:43:29 +1100 Subject: [PATCH 2/4] SECRETS: SUSE: implement SUSE container secrets @@ -19,10 +19,10 @@ Signed-off-by: Aleksa Sarai create mode 100644 daemon/suse_secrets.go diff --git a/daemon/start.go b/daemon/start.go -index 0b4eb6d67bcc..0bcecba31386 100644 +index 2e0b9e6be847..dca04486888f 100644 --- a/daemon/start.go +++ b/daemon/start.go -@@ -152,6 +152,11 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C +@@ -151,6 +151,11 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C return err } @@ -456,5 +456,5 @@ index 000000000000..32b0ece91b59 + return nil +} -- -2.40.1 +2.42.0 diff --git a/0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch b/0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch index 30213c0..dac0041 100644 --- a/0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch +++ b/0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch @@ -1,4 +1,4 @@ -From 16b520570514380a706fc13363b5e5c64f9fa4e7 Mon Sep 17 00:00:00 2001 +From fd0172ba27352f397ce7ff05d5dd1ec6c80054e5 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 22 May 2023 15:44:54 +1000 Subject: [PATCH 3/4] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI @@ -42,5 +42,5 @@ index d88efc4be2bb..4e976aa689cd 100644 static void set_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct, const char* value) { snprintf(btrfs_struct->name, BTRFS_SUBVOL_NAME_MAX, "%s", value); -- -2.40.1 +2.42.0 diff --git a/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch b/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch index ae3a887..c2465d9 100644 --- a/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch +++ b/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch @@ -1,4 +1,4 @@ -From 45cbecbd3ee7b4f21ce32c16979631b6d87b6cf6 Mon Sep 17 00:00:00 2001 +From c19fad9e09248bf390fe9b2cd38f351104f186b8 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Fri, 29 Jun 2018 17:59:30 +1000 Subject: [PATCH 4/4] bsc1073877: apparmor: clobber docker-default profile on @@ -69,10 +69,10 @@ index e3dc18b32b5e..9c7723056268 100644 return nil } diff --git a/daemon/daemon.go b/daemon/daemon.go -index 9be2f289696a..25fa052310e2 100644 +index 4d76c5798888..15c95b50c4eb 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go -@@ -836,8 +836,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S +@@ -839,8 +839,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S logrus.Warnf("Failed to configure golang's threads limit: %v", err) } @@ -85,5 +85,5 @@ index 9be2f289696a..25fa052310e2 100644 } -- -2.40.1 +2.42.0 diff --git a/_service b/_service index ace075b..c971130 100644 --- a/_service +++ b/_service @@ -1,21 +1,21 @@ - + https://github.com/moby/moby.git git .git - 24.0.5_ce_%h - v24.0.5 + 24.0.6_ce_%h + v24.0.6 docker - + https://github.com/docker/cli.git git .git - 24.0.5_ce - v24.0.5 + 24.0.6_ce + v24.0.6 docker-cli - + docker-*.tar xz diff --git a/cli-0001-docs-include-required-tools-in-source-tree.patch b/cli-0001-docs-include-required-tools-in-source-tree.patch index bc867e3..5baf82b 100644 --- a/cli-0001-docs-include-required-tools-in-source-tree.patch +++ b/cli-0001-docs-include-required-tools-in-source-tree.patch @@ -1,4 +1,4 @@ -From 3461d391fcee06e89b3bb4768bc15779d92388b8 Mon Sep 17 00:00:00 2001 +From c67c015fe466ac8fef065f7b8e2f32c01293f65f Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 26 Apr 2023 10:13:48 +1000 Subject: [PATCH] docs: include required tools in source tree @@ -45,8 +45,8 @@ Signed-off-by: Aleksa Sarai .../github.com/docker/cli-docs-tool/README.md | 67 + .../cli-docs-tool/annotation/annotation.go | 25 + .../docker/cli-docs-tool/clidocstool.go | 123 + - .../docker/cli-docs-tool/clidocstool_md.go | 271 ++ - .../docker/cli-docs-tool/clidocstool_yaml.go | 433 +++ + .../docker/cli-docs-tool/clidocstool_md.go | 280 ++ + .../docker/cli-docs-tool/clidocstool_yaml.go | 435 +++ .../docker/cli-docs-tool/docker-bake.hcl | 51 + .../docker/cli-docs-tool/markdown.go | 87 + .../russross/blackfriday/v2/.gitignore | 8 + @@ -89,7 +89,7 @@ Signed-off-by: Aleksa Sarai vendor/gopkg.in/yaml.v3/yamlh.go | 807 +++++ vendor/gopkg.in/yaml.v3/yamlprivateh.go | 198 ++ vendor/modules.txt | 15 + - 71 files changed, 22970 insertions(+), 111 deletions(-) + 71 files changed, 22981 insertions(+), 111 deletions(-) delete mode 100644 docs/generate/go.mod delete mode 100644 docs/generate/tools.go create mode 100644 import.go @@ -156,9 +156,10 @@ Signed-off-by: Aleksa Sarai create mode 100644 vendor/gopkg.in/yaml.v3/yamlh.go create mode 100644 vendor/gopkg.in/yaml.v3/yamlprivateh.go -Index: docker-cli-24.0.5_ce/docs/generate/go.mod -=================================================================== ---- docker-cli-24.0.5_ce.orig/docs/generate/go.mod +diff --git a/docs/generate/go.mod b/docs/generate/go.mod +deleted file mode 100644 +index d62ff455713a..000000000000 +--- a/docs/generate/go.mod +++ /dev/null @@ -1,13 +0,0 @@ -module github.com/docker/cli/docs/generate @@ -174,9 +175,10 @@ Index: docker-cli-24.0.5_ce/docs/generate/go.mod -//) -// -//replace github.com/docker/cli v0.0.0+incompatible => ../../ -Index: docker-cli-24.0.5_ce/docs/generate/tools.go -=================================================================== ---- docker-cli-24.0.5_ce.orig/docs/generate/tools.go +diff --git a/docs/generate/tools.go b/docs/generate/tools.go +deleted file mode 100644 +index 47510bc49a89..000000000000 +--- a/docs/generate/tools.go +++ /dev/null @@ -1,8 +0,0 @@ -//go:build tools @@ -187,10 +189,11 @@ Index: docker-cli-24.0.5_ce/docs/generate/tools.go -import ( - _ "github.com/docker/cli-docs-tool" -) -Index: docker-cli-24.0.5_ce/import.go -=================================================================== +diff --git a/import.go b/import.go +new file mode 100644 +index 000000000000..16ef6ef60c0e --- /dev/null -+++ docker-cli-24.0.5_ce/import.go ++++ b/import.go @@ -0,0 +1,17 @@ +// This is only used to define inports we need for doc generation. + @@ -209,9 +212,10 @@ Index: docker-cli-24.0.5_ce/import.go + _ "github.com/spf13/cobra/doc" + _ "github.com/spf13/pflag" +) -Index: docker-cli-24.0.5_ce/man/go.mod -=================================================================== ---- docker-cli-24.0.5_ce.orig/man/go.mod +diff --git a/man/go.mod b/man/go.mod +deleted file mode 100644 +index 4615c7c9a59b..000000000000 +--- a/man/go.mod +++ /dev/null @@ -1,15 +0,0 @@ -module github.com/docker/cli/man @@ -229,9 +233,10 @@ Index: docker-cli-24.0.5_ce/man/go.mod -//) -// -//replace github.com/docker/cli v0.0.0+incompatible => ../ -Index: docker-cli-24.0.5_ce/man/tools.go -=================================================================== ---- docker-cli-24.0.5_ce.orig/man/tools.go +diff --git a/man/tools.go b/man/tools.go +deleted file mode 100644 +index 3cafe6533aff..000000000000 +--- a/man/tools.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build tools @@ -245,10 +250,10 @@ Index: docker-cli-24.0.5_ce/man/tools.go - _ "github.com/spf13/cobra/doc" - _ "github.com/spf13/pflag" -) -Index: docker-cli-24.0.5_ce/scripts/docs/generate-man.sh -=================================================================== ---- docker-cli-24.0.5_ce.orig/scripts/docs/generate-man.sh -+++ docker-cli-24.0.5_ce/scripts/docs/generate-man.sh +diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh +index 6afed3fa8708..1e12a95e9c9a 100755 +--- a/scripts/docs/generate-man.sh ++++ b/scripts/docs/generate-man.sh @@ -1,35 +1,22 @@ #!/usr/bin/env bash @@ -295,16 +300,16 @@ Index: docker-cli-24.0.5_ce/scripts/docs/generate-man.sh mkdir -p man/man1 (set -x ; /tmp/gen-manpages --root "." --target "$(pwd)/man/man1") -Index: docker-cli-24.0.5_ce/scripts/docs/generate-md.sh -=================================================================== ---- docker-cli-24.0.5_ce.orig/scripts/docs/generate-md.sh -+++ docker-cli-24.0.5_ce/scripts/docs/generate-md.sh +diff --git a/scripts/docs/generate-md.sh b/scripts/docs/generate-md.sh +index 7b49c39341ec..0af86843bbe4 100755 +--- a/scripts/docs/generate-md.sh ++++ b/scripts/docs/generate-md.sh @@ -1,36 +1,23 @@ #!/usr/bin/env bash -set -eu - --: "${CLI_DOCS_TOOL_VERSION=v0.5.1}" +-: "${CLI_DOCS_TOOL_VERSION=v0.6.0}" +set -Eeuo pipefail export GO111MODULE=auto @@ -343,10 +348,10 @@ Index: docker-cli-24.0.5_ce/scripts/docs/generate-md.sh # yaml generation on docs repo needs the cli.md file: https://github.com/docker/cli/pull/3924#discussion_r1059986605 # but markdown generation docker.md atm. While waiting for a fix in cli-docs-tool -Index: docker-cli-24.0.5_ce/scripts/docs/generate-yaml.sh -=================================================================== ---- docker-cli-24.0.5_ce.orig/scripts/docs/generate-yaml.sh -+++ docker-cli-24.0.5_ce/scripts/docs/generate-yaml.sh +diff --git a/scripts/docs/generate-yaml.sh b/scripts/docs/generate-yaml.sh +index 4d0006e43e79..7d98e161df5d 100755 +--- a/scripts/docs/generate-yaml.sh ++++ b/scripts/docs/generate-yaml.sh @@ -1,33 +1,20 @@ #!/usr/bin/env bash @@ -389,19 +394,19 @@ Index: docker-cli-24.0.5_ce/scripts/docs/generate-yaml.sh mkdir -p docs/yaml set -x -Index: docker-cli-24.0.5_ce/vendor.mod -=================================================================== ---- docker-cli-24.0.5_ce.orig/vendor.mod -+++ docker-cli-24.0.5_ce/vendor.mod +diff --git a/vendor.mod b/vendor.mod +index d5de7f655968..39e20db6431b 100644 +--- a/vendor.mod ++++ b/vendor.mod @@ -8,7 +8,9 @@ go 1.18 require ( github.com/containerd/containerd v1.6.21 + github.com/cpuguy83/go-md2man/v2 v2.0.2 github.com/creack/pty v1.1.18 -+ github.com/docker/cli-docs-tool v0.5.1 ++ github.com/docker/cli-docs-tool v0.6.0 github.com/docker/distribution v2.8.2+incompatible - github.com/docker/docker v24.0.5-0.20230718221249-d4a26c153000+incompatible // v24.0.5-dev + github.com/docker/docker v24.0.5+incompatible github.com/docker/docker-credential-helpers v0.7.0 @@ -67,6 +69,7 @@ require ( github.com/prometheus/common v0.37.0 // indirect @@ -417,11 +422,11 @@ Index: docker-cli-24.0.5_ce/vendor.mod google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) -Index: docker-cli-24.0.5_ce/vendor.sum -=================================================================== ---- docker-cli-24.0.5_ce.orig/vendor.sum -+++ docker-cli-24.0.5_ce/vendor.sum -@@ -85,6 +85,7 @@ github.com/cockroachdb/logtags v0.0.0-20 +diff --git a/vendor.sum b/vendor.sum +index 7db5d7cec1ac..c5d63015597d 100644 +--- a/vendor.sum ++++ b/vendor.sum +@@ -85,6 +85,7 @@ github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u9 github.com/containerd/containerd v1.6.21 h1:eSTAmnvDKRPWan+MpSSfNyrtleXd86ogK9X8fMWpe/Q= github.com/containerd/containerd v1.6.21/go.mod h1:apei1/i5Ux2FzrK6+DM/suEsGuK/MeVOfy8tR2q7Wnw= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -429,16 +434,16 @@ Index: docker-cli-24.0.5_ce/vendor.sum github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -@@ -93,6 +94,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod +@@ -93,6 +94,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -+github.com/docker/cli-docs-tool v0.5.1 h1:jIk/cCZurZERhALPVKhqlNxTQGxn2kcI+56gE57PQXg= -+github.com/docker/cli-docs-tool v0.5.1/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbIwTusYpzCXS/o= ++github.com/docker/cli-docs-tool v0.6.0 h1:Z9x10SaZgFaB6jHgz3OWooynhSa40CsWkpe5hEnG/qA= ++github.com/docker/cli-docs-tool v0.6.0/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbIwTusYpzCXS/o= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -@@ -350,6 +353,7 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9we +@@ -350,6 +353,7 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -446,17 +451,19 @@ Index: docker-cli-24.0.5_ce/vendor.sum github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/.gitignore -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/.gitignore b/vendor/github.com/cpuguy83/go-md2man/v2/.gitignore +new file mode 100644 +index 000000000000..30f97c3d73ab --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/.gitignore ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/.gitignore @@ -0,0 +1,2 @@ +go-md2man +bin -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/Dockerfile -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/Dockerfile b/vendor/github.com/cpuguy83/go-md2man/v2/Dockerfile +new file mode 100644 +index 000000000000..7181c5306f41 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/Dockerfile ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/Dockerfile @@ -0,0 +1,20 @@ +ARG GO_VERSION=1.18 +ARG GO_IMAGE=golang:${GO_VERSION} @@ -478,10 +485,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/Dockerfile +FROM scratch +COPY --from=build /go/src/github.com/cpuguy83/go-md2man/go-md2man /go-md2man +ENTRYPOINT ["/go-md2man"] -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md b/vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md +new file mode 100644 +index 000000000000..1cade6cef6a1 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + @@ -504,10 +512,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/Makefile -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/Makefile b/vendor/github.com/cpuguy83/go-md2man/v2/Makefile +new file mode 100644 +index 000000000000..437fc9997926 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/Makefile ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/Makefile @@ -0,0 +1,35 @@ +GO111MODULE ?= on +LINTER_BIN ?= golangci-lint @@ -544,10 +553,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/Makefile +vendor: mod + @go mod vendor -v + -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/README.md -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/README.md b/vendor/github.com/cpuguy83/go-md2man/v2/README.md +new file mode 100644 +index 000000000000..0e30d341483c --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/README.md ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/README.md @@ -0,0 +1,15 @@ +go-md2man +========= @@ -564,10 +574,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/README.md + +We use go modules to manage dependencies. +As such you must be using at lest go1.11. -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/go-md2man.1.md -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/go-md2man.1.md b/vendor/github.com/cpuguy83/go-md2man/v2/go-md2man.1.md +new file mode 100644 +index 000000000000..16d1133aa1de --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/go-md2man.1.md ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/go-md2man.1.md @@ -0,0 +1,23 @@ +go-md2man 1 "January 2015" go-md2man "User Manual" +================================================== @@ -592,10 +603,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/go-md2man.1. +# HISTORY + January 2015, Originally compiled by Brian Goff( cpuguy83@gmail.com ) + -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go b/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go +new file mode 100644 +index 000000000000..6078864a3cd9 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go @@ -0,0 +1,51 @@ +package main + @@ -648,10 +660,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go + os.Exit(1) + } +} -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go +new file mode 100644 +index 000000000000..b48005673455 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go @@ -0,0 +1,14 @@ +package md2man + @@ -667,10 +680,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2ma + []blackfriday.Option{blackfriday.WithRenderer(renderer), + blackfriday.WithExtensions(renderer.GetExtensions())}...) +} -Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go -=================================================================== +diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go +new file mode 100644 +index 000000000000..be2b3436062d --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go ++++ b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go @@ -0,0 +1,336 @@ +package md2man + @@ -1008,24 +1022,27 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff. + w.Write([]byte{'\\', text[i]}) // nolint: errcheck + } +} -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/.dockerignore -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/.dockerignore b/vendor/github.com/docker/cli-docs-tool/.dockerignore +new file mode 100644 +index 000000000000..c8c323c89663 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/.dockerignore ++++ b/vendor/github.com/docker/cli-docs-tool/.dockerignore @@ -0,0 +1,2 @@ +/coverage.txt +/example/docs -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/.gitignore -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/.gitignore b/vendor/github.com/docker/cli-docs-tool/.gitignore +new file mode 100644 +index 000000000000..c8c323c89663 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/.gitignore ++++ b/vendor/github.com/docker/cli-docs-tool/.gitignore @@ -0,0 +1,2 @@ +/coverage.txt +/example/docs -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/.golangci.yml -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/.golangci.yml b/vendor/github.com/docker/cli-docs-tool/.golangci.yml +new file mode 100644 +index 000000000000..6c6557176b28 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/.golangci.yml ++++ b/vendor/github.com/docker/cli-docs-tool/.golangci.yml @@ -0,0 +1,37 @@ +run: + timeout: 10m @@ -1064,10 +1081,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/.golangci.yml + - linters: + - revive + text: "stutters" -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/Dockerfile -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/Dockerfile b/vendor/github.com/docker/cli-docs-tool/Dockerfile +new file mode 100644 +index 000000000000..f0e2739faa7c --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/Dockerfile ++++ b/vendor/github.com/docker/cli-docs-tool/Dockerfile @@ -0,0 +1,86 @@ +# syntax=docker/dockerfile:1 + @@ -1155,10 +1173,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/Dockerfile + +FROM scratch AS test-coverage +COPY --from=test /tmp/coverage.txt /coverage.txt -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/LICENSE -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/LICENSE b/vendor/github.com/docker/cli-docs-tool/LICENSE +new file mode 100644 +index 000000000000..d64569567334 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/LICENSE ++++ b/vendor/github.com/docker/cli-docs-tool/LICENSE @@ -0,0 +1,202 @@ + + Apache License @@ -1362,10 +1381,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/LICENSE + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/README.md -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/README.md b/vendor/github.com/docker/cli-docs-tool/README.md +new file mode 100644 +index 000000000000..4d5ee6474f8f --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/README.md ++++ b/vendor/github.com/docker/cli-docs-tool/README.md @@ -0,0 +1,67 @@ +[![PkgGoDev](https://img.shields.io/badge/go.dev-docs-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/docker/cli-docs-tool) +[![Test Status](https://img.shields.io/github/actions/workflow/status/docker/cli-docs-tool/test.yml?branch=main&label=test&logo=github&style=flat-square)](https://github.com/docker/cli-docs-tool/actions?query=workflow%3Atest) @@ -1434,10 +1454,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/README.md + +Want to contribute? Awesome! You can find information about contributing to +this project in the [CONTRIBUTING.md](/.github/CONTRIBUTING.md) -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/annotation/annotation.go -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/annotation/annotation.go b/vendor/github.com/docker/cli-docs-tool/annotation/annotation.go +new file mode 100644 +index 000000000000..021846af6e07 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/annotation/annotation.go ++++ b/vendor/github.com/docker/cli-docs-tool/annotation/annotation.go @@ -0,0 +1,25 @@ +// Copyright 2021 cli-docs-tool authors +// @@ -1464,10 +1485,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/annotation/an + // DefaultValue specifies the default value for a flag. + DefaultValue = "docs.default-value" +) -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool.go -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/clidocstool.go b/vendor/github.com/docker/cli-docs-tool/clidocstool.go +new file mode 100644 +index 000000000000..d4aeaba3f126 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool.go ++++ b/vendor/github.com/docker/cli-docs-tool/clidocstool.go @@ -0,0 +1,123 @@ +// Copyright 2017 cli-docs-tool authors +// @@ -1592,11 +1614,12 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool.g + } + return aliases +} -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_md.go -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/clidocstool_md.go b/vendor/github.com/docker/cli-docs-tool/clidocstool_md.go +new file mode 100644 +index 000000000000..1dee58c06ca1 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_md.go -@@ -0,0 +1,271 @@ ++++ b/vendor/github.com/docker/cli-docs-tool/clidocstool_md.go +@@ -0,0 +1,280 @@ +// Copyright 2021 cli-docs-tool authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); @@ -1652,6 +1675,12 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_m + return nil + } + ++ // Skip hidden command ++ if cmd.Hidden { ++ log.Printf("INFO: Skipping Markdown for %q (hidden command)", cmd.CommandPath()) ++ return nil ++ } ++ + log.Printf("INFO: Generating Markdown for %q", cmd.CommandPath()) + mdFile := mdFilename(cmd) + sourcePath := filepath.Join(c.source, mdFile) @@ -1807,6 +1836,9 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_m + b.WriteString("### Subcommands\n\n") + table := newMdTable("Name", "Description") + for _, c := range cmd.Commands() { ++ if c.Hidden { ++ continue ++ } + table.AddRow(fmt.Sprintf("[`%s`](%s)", c.Name(), mdFilename(c)), c.Short) + } + b.WriteString(table.String() + "\n") @@ -1868,11 +1900,12 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_m +func mdReplaceNewline(s string) string { + return nlRegexp.ReplaceAllString(s, "
") +} -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_yaml.go -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/clidocstool_yaml.go b/vendor/github.com/docker/cli-docs-tool/clidocstool_yaml.go +new file mode 100644 +index 000000000000..523524297af4 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_yaml.go -@@ -0,0 +1,433 @@ ++++ b/vendor/github.com/docker/cli-docs-tool/clidocstool_yaml.go +@@ -0,0 +1,435 @@ +// Copyright 2017 cli-docs-tool authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); @@ -1937,6 +1970,7 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_y + InheritedOptions []cmdOption `yaml:"inherited_options,omitempty"` + Example string `yaml:"examples,omitempty"` + Deprecated bool ++ Hidden bool + MinAPIVersion string `yaml:"min_api_version,omitempty"` + Experimental bool + ExperimentalCLI bool @@ -2030,6 +2064,7 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_y + Long: forceMultiLine(cmd.Long, longMaxWidth), + Example: cmd.Example, + Deprecated: len(cmd.Deprecated) > 0, ++ Hidden: cmd.Hidden, + } + + if len(cliDoc.Long) == 0 { @@ -2306,10 +2341,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/clidocstool_y +func (s byName) Len() int { return len(s) } +func (s byName) Swap(i, j int) { s[i], s[j] = s[j], s[i] } +func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() } -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/docker-bake.hcl -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/docker-bake.hcl b/vendor/github.com/docker/cli-docs-tool/docker-bake.hcl +new file mode 100644 +index 000000000000..4a5f44f83018 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/docker-bake.hcl ++++ b/vendor/github.com/docker/cli-docs-tool/docker-bake.hcl @@ -0,0 +1,51 @@ +// Copyright 2021 cli-docs-tool authors +// @@ -2362,10 +2398,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/docker-bake.h + target = "license-update" + output = ["."] +} -Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/markdown.go -=================================================================== +diff --git a/vendor/github.com/docker/cli-docs-tool/markdown.go b/vendor/github.com/docker/cli-docs-tool/markdown.go +new file mode 100644 +index 000000000000..32849236ed9c --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/markdown.go ++++ b/vendor/github.com/docker/cli-docs-tool/markdown.go @@ -0,0 +1,87 @@ +// Copyright 2017 cli-docs-tool authors +// @@ -2454,10 +2491,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/docker/cli-docs-tool/markdown.go + } + return mdLine, customID +} -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/.gitignore -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/.gitignore b/vendor/github.com/russross/blackfriday/v2/.gitignore +new file mode 100644 +index 000000000000..75623dcccbb7 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/.gitignore ++++ b/vendor/github.com/russross/blackfriday/v2/.gitignore @@ -0,0 +1,8 @@ +*.out +*.swp @@ -2467,10 +2505,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/.gitignore +_test* +markdown +tags -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/.travis.yml -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/.travis.yml b/vendor/github.com/russross/blackfriday/v2/.travis.yml +new file mode 100644 +index 000000000000..b0b525a5a8e1 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/.travis.yml ++++ b/vendor/github.com/russross/blackfriday/v2/.travis.yml @@ -0,0 +1,17 @@ +sudo: false +language: go @@ -2489,10 +2528,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/.travis.ym + - diff -u <(echo -n) <(gofmt -d -s .) + - go tool vet . + - go test -v ./... -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/LICENSE.txt -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/LICENSE.txt b/vendor/github.com/russross/blackfriday/v2/LICENSE.txt +new file mode 100644 +index 000000000000..2885af3602d8 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/LICENSE.txt ++++ b/vendor/github.com/russross/blackfriday/v2/LICENSE.txt @@ -0,0 +1,29 @@ +Blackfriday is distributed under the Simplified BSD License: + @@ -2523,10 +2563,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/LICENSE.tx +> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +> POSSIBILITY OF SUCH DAMAGE. -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/README.md -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/README.md b/vendor/github.com/russross/blackfriday/v2/README.md +new file mode 100644 +index 000000000000..d9c08a22fc54 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/README.md ++++ b/vendor/github.com/russross/blackfriday/v2/README.md @@ -0,0 +1,335 @@ +Blackfriday +[![Build Status][BuildV2SVG]][BuildV2URL] @@ -2863,10 +2904,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/README.md + [BuildV2URL]: https://travis-ci.org/russross/blackfriday + [PkgGoDevV2SVG]: https://pkg.go.dev/badge/github.com/russross/blackfriday/v2 + [PkgGoDevV2URL]: https://pkg.go.dev/github.com/russross/blackfriday/v2 -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/block.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/block.go b/vendor/github.com/russross/blackfriday/v2/block.go +new file mode 100644 +index 000000000000..dcd61e6e35bc --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/block.go ++++ b/vendor/github.com/russross/blackfriday/v2/block.go @@ -0,0 +1,1612 @@ +// +// Blackfriday Markdown Processor @@ -4480,10 +4522,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/block.go + } + return string(anchorName) +} -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/doc.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/doc.go b/vendor/github.com/russross/blackfriday/v2/doc.go +new file mode 100644 +index 000000000000..57ff152a0568 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/doc.go ++++ b/vendor/github.com/russross/blackfriday/v2/doc.go @@ -0,0 +1,46 @@ +// Package blackfriday is a markdown processor. +// @@ -4531,10 +4574,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/doc.go +// github.com/shurcooL/sanitized_anchor_name. +// Otherwise, users of sanitized_anchor_name will get anchor names +// that are incompatible with those generated by blackfriday. -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/entities.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/entities.go b/vendor/github.com/russross/blackfriday/v2/entities.go +new file mode 100644 +index 000000000000..a2c3edb691c8 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/entities.go ++++ b/vendor/github.com/russross/blackfriday/v2/entities.go @@ -0,0 +1,2236 @@ +package blackfriday + @@ -6772,10 +6816,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/entities.g + "‍": true, + "‌": true, +} -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/esc.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/esc.go b/vendor/github.com/russross/blackfriday/v2/esc.go +new file mode 100644 +index 000000000000..6ab60102c9bf --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/esc.go ++++ b/vendor/github.com/russross/blackfriday/v2/esc.go @@ -0,0 +1,70 @@ +package blackfriday + @@ -6847,10 +6892,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/esc.go + unesc := html.UnescapeString(string(text)) + escapeHTML(w, []byte(unesc)) +} -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/html.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/html.go b/vendor/github.com/russross/blackfriday/v2/html.go +new file mode 100644 +index 000000000000..cb4f26e30fd5 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/html.go ++++ b/vendor/github.com/russross/blackfriday/v2/html.go @@ -0,0 +1,952 @@ +// +// Blackfriday Markdown Processor @@ -7804,10 +7850,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/html.go + } + r.lastOutputLen = buf.Len() +} -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/inline.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/inline.go b/vendor/github.com/russross/blackfriday/v2/inline.go +new file mode 100644 +index 000000000000..d45bd941726e --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/inline.go ++++ b/vendor/github.com/russross/blackfriday/v2/inline.go @@ -0,0 +1,1228 @@ +// +// Blackfriday Markdown Processor @@ -9037,10 +9084,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/inline.go +func normalizeURI(s []byte) []byte { + return s // TODO: implement +} -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/markdown.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/markdown.go b/vendor/github.com/russross/blackfriday/v2/markdown.go +new file mode 100644 +index 000000000000..58d2e4538c62 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/markdown.go ++++ b/vendor/github.com/russross/blackfriday/v2/markdown.go @@ -0,0 +1,950 @@ +// Blackfriday Markdown Processor +// Available at http://github.com/russross/blackfriday @@ -9992,10 +10040,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/markdown.g + } + return out[a : b+1] +} -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/node.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/node.go b/vendor/github.com/russross/blackfriday/v2/node.go +new file mode 100644 +index 000000000000..04e6050ceeae --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/node.go ++++ b/vendor/github.com/russross/blackfriday/v2/node.go @@ -0,0 +1,360 @@ +package blackfriday + @@ -10357,10 +10406,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/node.go +func dumpString(ast *Node) string { + return dumpR(ast, 0) +} -Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/smartypants.go -=================================================================== +diff --git a/vendor/github.com/russross/blackfriday/v2/smartypants.go b/vendor/github.com/russross/blackfriday/v2/smartypants.go +new file mode 100644 +index 000000000000..3a220e94247d --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/smartypants.go ++++ b/vendor/github.com/russross/blackfriday/v2/smartypants.go @@ -0,0 +1,457 @@ +// +// Blackfriday Markdown Processor @@ -10819,10 +10869,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/russross/blackfriday/v2/smartypant + w.Write(text[mark:]) + } +} -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/README.md -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/README.md b/vendor/github.com/spf13/cobra/doc/README.md +new file mode 100644 +index 000000000000..8e07baae3307 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/README.md ++++ b/vendor/github.com/spf13/cobra/doc/README.md @@ -0,0 +1,17 @@ +# Documentation generation + @@ -10841,10 +10892,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/README.md +### `InitDefaultCompletionCmd` + +You may call `cmd.InitDefaultCompletionCmd()` to document the default autocompletion command. -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/man_docs.go -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/man_docs.go b/vendor/github.com/spf13/cobra/doc/man_docs.go +new file mode 100644 +index 000000000000..b8c15ce88543 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/man_docs.go ++++ b/vendor/github.com/spf13/cobra/doc/man_docs.go @@ -0,0 +1,246 @@ +// Copyright 2013-2023 The Cobra Authors +// @@ -11092,10 +11144,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/man_docs.go + } + return buf.Bytes() +} -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/man_docs.md -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/man_docs.md b/vendor/github.com/spf13/cobra/doc/man_docs.md +new file mode 100644 +index 000000000000..3709160f34f0 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/man_docs.md ++++ b/vendor/github.com/spf13/cobra/doc/man_docs.md @@ -0,0 +1,31 @@ +# Generating Man Pages For Your Own cobra.Command + @@ -11128,10 +11181,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/man_docs.md +``` + +That will get you a man page `/tmp/test.3` -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/md_docs.go -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/md_docs.go b/vendor/github.com/spf13/cobra/doc/md_docs.go +new file mode 100644 +index 000000000000..c4a27c00935b --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/md_docs.go ++++ b/vendor/github.com/spf13/cobra/doc/md_docs.go @@ -0,0 +1,156 @@ +// Copyright 2013-2023 The Cobra Authors +// @@ -11289,10 +11343,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/md_docs.go + } + return nil +} -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/md_docs.md -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/md_docs.md b/vendor/github.com/spf13/cobra/doc/md_docs.md +new file mode 100644 +index 000000000000..1659175cfdab --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/md_docs.md ++++ b/vendor/github.com/spf13/cobra/doc/md_docs.md @@ -0,0 +1,115 @@ +# Generating Markdown Docs For Your Own cobra.Command + @@ -11409,10 +11464,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/md_docs.md + return "/commands/" + strings.ToLower(base) + "/" +} +``` -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/rest_docs.go -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/rest_docs.go b/vendor/github.com/spf13/cobra/doc/rest_docs.go +new file mode 100644 +index 000000000000..2cca6fd778de --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/rest_docs.go ++++ b/vendor/github.com/spf13/cobra/doc/rest_docs.go @@ -0,0 +1,186 @@ +// Copyright 2013-2023 The Cobra Authors +// @@ -11600,10 +11656,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/rest_docs.go + } + return string(res) +} -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/rest_docs.md -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/rest_docs.md b/vendor/github.com/spf13/cobra/doc/rest_docs.md +new file mode 100644 +index 000000000000..3041c573ab01 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/rest_docs.md ++++ b/vendor/github.com/spf13/cobra/doc/rest_docs.md @@ -0,0 +1,114 @@ +# Generating ReStructured Text Docs For Your Own cobra.Command + @@ -11719,10 +11776,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/rest_docs.md + return fmt.Sprintf(":ref:`%s <%s>`", name, ref) +} +``` -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/util.go -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/util.go b/vendor/github.com/spf13/cobra/doc/util.go +new file mode 100644 +index 000000000000..0aaa07a166d8 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/util.go ++++ b/vendor/github.com/spf13/cobra/doc/util.go @@ -0,0 +1,52 @@ +// Copyright 2013-2023 The Cobra Authors +// @@ -11776,10 +11834,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/util.go +func (s byName) Len() int { return len(s) } +func (s byName) Swap(i, j int) { s[i], s[j] = s[j], s[i] } +func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() } -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/yaml_docs.go -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/yaml_docs.go b/vendor/github.com/spf13/cobra/doc/yaml_docs.go +new file mode 100644 +index 000000000000..2b26d6ec0f3e --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/yaml_docs.go ++++ b/vendor/github.com/spf13/cobra/doc/yaml_docs.go @@ -0,0 +1,175 @@ +// Copyright 2013-2023 The Cobra Authors +// @@ -11956,10 +12015,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/yaml_docs.go + + return result +} -Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/yaml_docs.md -=================================================================== +diff --git a/vendor/github.com/spf13/cobra/doc/yaml_docs.md b/vendor/github.com/spf13/cobra/doc/yaml_docs.md +new file mode 100644 +index 000000000000..172e61d12145 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/yaml_docs.md ++++ b/vendor/github.com/spf13/cobra/doc/yaml_docs.md @@ -0,0 +1,112 @@ +# Generating Yaml Docs For Your Own cobra.Command + @@ -12073,10 +12133,11 @@ Index: docker-cli-24.0.5_ce/vendor/github.com/spf13/cobra/doc/yaml_docs.md + return "/commands/" + strings.ToLower(base) + "/" +} +``` -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/LICENSE -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/LICENSE b/vendor/gopkg.in/yaml.v3/LICENSE +new file mode 100644 +index 000000000000..2683e4bb1f24 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/LICENSE ++++ b/vendor/gopkg.in/yaml.v3/LICENSE @@ -0,0 +1,50 @@ + +This project is covered by two different licenses: MIT and Apache. @@ -12128,10 +12189,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/LICENSE +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/NOTICE -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/NOTICE b/vendor/gopkg.in/yaml.v3/NOTICE +new file mode 100644 +index 000000000000..866d74a7ad79 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/NOTICE ++++ b/vendor/gopkg.in/yaml.v3/NOTICE @@ -0,0 +1,13 @@ +Copyright 2011-2016 Canonical Ltd. + @@ -12146,10 +12208,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/NOTICE +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/README.md -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/README.md b/vendor/gopkg.in/yaml.v3/README.md +new file mode 100644 +index 000000000000..08eb1babddfa --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/README.md ++++ b/vendor/gopkg.in/yaml.v3/README.md @@ -0,0 +1,150 @@ +# YAML support for the Go language + @@ -12301,10 +12364,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/README.md + - 4 +``` + -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/apic.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/apic.go b/vendor/gopkg.in/yaml.v3/apic.go +new file mode 100644 +index 000000000000..ae7d049f182a --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/apic.go ++++ b/vendor/gopkg.in/yaml.v3/apic.go @@ -0,0 +1,747 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -13053,10 +13117,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/apic.go +//} +// +// -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/decode.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/decode.go b/vendor/gopkg.in/yaml.v3/decode.go +new file mode 100644 +index 000000000000..0173b6982e84 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/decode.go ++++ b/vendor/gopkg.in/yaml.v3/decode.go @@ -0,0 +1,1000 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -14058,10 +14123,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/decode.go +func isMerge(n *Node) bool { + return n.Kind == ScalarNode && n.Value == "<<" && (n.Tag == "" || n.Tag == "!" || shortTag(n.Tag) == mergeTag) +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/emitterc.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/emitterc.go b/vendor/gopkg.in/yaml.v3/emitterc.go +new file mode 100644 +index 000000000000..0f47c9ca8add --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/emitterc.go ++++ b/vendor/gopkg.in/yaml.v3/emitterc.go @@ -0,0 +1,2020 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -16083,10 +16149,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/emitterc.go + //emitter.indention = true + return true +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/encode.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/encode.go b/vendor/gopkg.in/yaml.v3/encode.go +new file mode 100644 +index 000000000000..de9e72a3e638 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/encode.go ++++ b/vendor/gopkg.in/yaml.v3/encode.go @@ -0,0 +1,577 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -16665,10 +16732,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/encode.go + failf("cannot encode node with unknown kind %d", node.Kind) + } +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/parserc.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/parserc.go b/vendor/gopkg.in/yaml.v3/parserc.go +new file mode 100644 +index 000000000000..268558a0d632 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/parserc.go ++++ b/vendor/gopkg.in/yaml.v3/parserc.go @@ -0,0 +1,1258 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -17928,10 +17996,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/parserc.go + parser.tag_directives = append(parser.tag_directives, value_copy) + return true +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/readerc.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/readerc.go b/vendor/gopkg.in/yaml.v3/readerc.go +new file mode 100644 +index 000000000000..b7de0a89c462 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/readerc.go ++++ b/vendor/gopkg.in/yaml.v3/readerc.go @@ -0,0 +1,434 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -18367,10 +18436,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/readerc.go + parser.buffer = parser.buffer[:buffer_len] + return true +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/resolve.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/resolve.go b/vendor/gopkg.in/yaml.v3/resolve.go +new file mode 100644 +index 000000000000..64ae888057a5 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/resolve.go ++++ b/vendor/gopkg.in/yaml.v3/resolve.go @@ -0,0 +1,326 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -18698,10 +18768,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/resolve.go + } + return time.Time{}, false +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/scannerc.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/scannerc.go b/vendor/gopkg.in/yaml.v3/scannerc.go +new file mode 100644 +index 000000000000..ca0070108f4e --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/scannerc.go ++++ b/vendor/gopkg.in/yaml.v3/scannerc.go @@ -0,0 +1,3038 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -21741,10 +21812,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/scannerc.go + } + return true +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/sorter.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/sorter.go b/vendor/gopkg.in/yaml.v3/sorter.go +new file mode 100644 +index 000000000000..9210ece7e972 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/sorter.go ++++ b/vendor/gopkg.in/yaml.v3/sorter.go @@ -0,0 +1,134 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -21880,10 +21952,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/sorter.go + } + panic("not a number") +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/writerc.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/writerc.go b/vendor/gopkg.in/yaml.v3/writerc.go +new file mode 100644 +index 000000000000..b8a116bf9a22 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/writerc.go ++++ b/vendor/gopkg.in/yaml.v3/writerc.go @@ -0,0 +1,48 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -21933,10 +22006,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/writerc.go + emitter.buffer_pos = 0 + return true +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yaml.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/yaml.go b/vendor/gopkg.in/yaml.v3/yaml.go +new file mode 100644 +index 000000000000..8cec6da48d3e --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yaml.go ++++ b/vendor/gopkg.in/yaml.v3/yaml.go @@ -0,0 +1,698 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -22636,10 +22710,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yaml.go + } + return false +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yamlh.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/yamlh.go b/vendor/gopkg.in/yaml.v3/yamlh.go +new file mode 100644 +index 000000000000..7c6d00770619 --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yamlh.go ++++ b/vendor/gopkg.in/yaml.v3/yamlh.go @@ -0,0 +1,807 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -23448,10 +23523,11 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yamlh.go + + document *yaml_document_t // The currently emitted document. +} -Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yamlprivateh.go -=================================================================== +diff --git a/vendor/gopkg.in/yaml.v3/yamlprivateh.go b/vendor/gopkg.in/yaml.v3/yamlprivateh.go +new file mode 100644 +index 000000000000..e88f9c54aecb --- /dev/null -+++ docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yamlprivateh.go ++++ b/vendor/gopkg.in/yaml.v3/yamlprivateh.go @@ -0,0 +1,198 @@ +// +// Copyright (c) 2011-2019 Canonical Ltd @@ -23651,10 +23727,10 @@ Index: docker-cli-24.0.5_ce/vendor/gopkg.in/yaml.v3/yamlprivateh.go + return 0 + +} -Index: docker-cli-24.0.5_ce/vendor/modules.txt -=================================================================== ---- docker-cli-24.0.5_ce.orig/vendor/modules.txt -+++ docker-cli-24.0.5_ce/vendor/modules.txt +diff --git a/vendor/modules.txt b/vendor/modules.txt +index c55a5e0111f3..d639b2eac8b4 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt @@ -18,9 +18,17 @@ github.com/containerd/containerd/errdefs github.com/containerd/containerd/log github.com/containerd/containerd/pkg/userns @@ -23666,14 +23742,14 @@ Index: docker-cli-24.0.5_ce/vendor/modules.txt # github.com/creack/pty v1.1.18 ## explicit; go 1.13 github.com/creack/pty -+# github.com/docker/cli-docs-tool v0.5.1 ++# github.com/docker/cli-docs-tool v0.6.0 +## explicit; go 1.18 +github.com/docker/cli-docs-tool +github.com/docker/cli-docs-tool/annotation # github.com/docker/distribution v2.8.2+incompatible ## explicit github.com/docker/distribution -@@ -224,12 +232,16 @@ github.com/prometheus/procfs/internal/ut +@@ -224,12 +232,16 @@ github.com/prometheus/procfs/internal/util # github.com/rivo/uniseg v0.2.0 ## explicit; go 1.12 github.com/rivo/uniseg @@ -23690,13 +23766,16 @@ Index: docker-cli-24.0.5_ce/vendor/modules.txt # github.com/spf13/pflag v1.0.5 ## explicit; go 1.12 github.com/spf13/pflag -@@ -391,6 +403,9 @@ google.golang.org/protobuf/types/known/t +@@ -391,6 +403,9 @@ google.golang.org/protobuf/types/known/timestamppb # gopkg.in/yaml.v2 v2.4.0 ## explicit; go 1.15 gopkg.in/yaml.v2 +# gopkg.in/yaml.v3 v3.0.1 +## explicit +gopkg.in/yaml.v3 - # gotest.tools/v3 v3.4.0 - ## explicit; go 1.13 + # gotest.tools/v3 v3.5.0 + ## explicit; go 1.17 gotest.tools/v3/assert +-- +2.42.0 + diff --git a/docker-24.0.5_ce_a61e2b4c9.tar.xz b/docker-24.0.5_ce_a61e2b4c9.tar.xz deleted file mode 100644 index e46aa0c..0000000 --- a/docker-24.0.5_ce_a61e2b4c9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ce2961a4bf764d3eda70b99529a0867129f681f47d48a1d3be859ecdd84f058 -size 8780596 diff --git a/docker-24.0.6_ce_1a7969545d73.tar.xz b/docker-24.0.6_ce_1a7969545d73.tar.xz new file mode 100644 index 0000000..332f0cc --- /dev/null +++ b/docker-24.0.6_ce_1a7969545d73.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:565f1ae195dcbcae8bb0b966d053d7beb5dfafb883f79a699a12bba65a2a3e48 +size 8793164 diff --git a/docker-cli-24.0.5_ce.tar.xz b/docker-cli-24.0.5_ce.tar.xz deleted file mode 100644 index e9c30fc..0000000 --- a/docker-cli-24.0.5_ce.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e925ce05ffeea40963a697a1b8a8dc07d71e06e4f928dab699c34d3d6a9fa55 -size 3516992 diff --git a/docker-cli-24.0.6_ce.tar.xz b/docker-cli-24.0.6_ce.tar.xz new file mode 100644 index 0000000..8be5e34 --- /dev/null +++ b/docker-cli-24.0.6_ce.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad3917307bb3e4446ab625679921ee7dc7e555dfdd48f0bb7d72d59d69880265 +size 3516364 diff --git a/docker.changes b/docker.changes index f4c6473..bf74532 100644 --- a/docker.changes +++ b/docker.changes @@ -1,8 +1,24 @@ +------------------------------------------------------------------- +Thu Sep 14 01:46:30 UTC 2023 - Aleksa Sarai + +- Update to Docker 24.0.6-ce. See upstream changelong online at + . bsc#1215323 +- Rebase patches: + * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch + * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch + * 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch + * 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch + * cli-0001-docs-include-required-tools-in-source-tree.patch +- Switch from disabledrun to manualrun in _service. +- Add a docker.socket unit file, but with socket activation effectively + disabled to ensure that Docker will always run even if you start the socket + individually. Users should probably just ignore this unit file. bsc#1210141 + ------------------------------------------------------------------- Tue Jul 25 19:40:25 UTC 2023 - Dirk Müller -- update to Docker 24.0.5-ce. See upstream changelong online at - . bsc#1213229 +- Update to Docker 24.0.5-ce. See upstream changelong online at + . bsc#1213229 ------------------------------------------------------------------- Fri Jul 7 21:29:05 UTC 2023 - Aleksa Sarai diff --git a/docker.service b/docker.service index 0b2f984..1c3564e 100644 --- a/docker.service +++ b/docker.service @@ -2,6 +2,12 @@ Description=Docker Application Container Engine Documentation=http://docs.docker.com After=network.target lvm2-monitor.service firewalld.service +# We don't use the docker socket activation, but doing this ensures that the +# docker.socket unit is alive while Docker is (docker.socket has BindsTo, so we +# only need a weak requirement to make sure starting docker.service also +# "starts" the socket service). Forcefully stopping docker.socket will not +# cause docker to die, but there's no nice workaround for that. +Wants=docker.socket [Service] EnvironmentFile=/etc/sysconfig/docker diff --git a/docker.socket b/docker.socket new file mode 100644 index 0000000..13fe927 --- /dev/null +++ b/docker.socket @@ -0,0 +1,18 @@ +[Unit] +Description=Docker Socket for the API +# We use BindsTo in order to make sure that you cannot use socket-activation +# with Docker (Docker must always start at boot if enabled, otherwise +# containers will not run until some administrator interacts with Docker). +BindsTo=docker.service + +[Socket] +# If /var/run is not implemented as a symlink to /run, you may need to +# specify ListenStream=/var/run/docker.sock instead. +ListenStream=/run/docker.sock +SocketMode=0660 +SocketUser=root +SocketGroup=docker + +[Install] +WantedBy=sockets.target + diff --git a/docker.spec b/docker.spec index fbcf3d3..c4d9fbd 100644 --- a/docker.spec +++ b/docker.spec @@ -31,9 +31,9 @@ # helpfully injects into our build environment from the changelog). If you want # to generate a new git_commit_epoch, use this: # $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s' -%define real_version 24.0.5 -%define git_version a61e2b4c9 -%define git_commit_epoch 1689962786 +%define real_version 24.0.6 +%define git_version 1a7969545d73 +%define git_commit_epoch 1693336457 Name: docker Version: %{real_version}_ce @@ -50,12 +50,13 @@ Source1: %{name}-cli-%{version}.tar.xz Source3: docker-rpmlintrc # TODO: Move these source files to somewhere nicer. Source100: docker.service -Source101: 80-docker.rules -Source102: sysconfig.docker -Source103: README_SUSE.md -Source104: docker-audit.rules -Source105: docker-daemon.json -Source106: docker.sysusers +Source101: docker.socket +Source110: 80-docker.rules +Source120: sysconfig.docker +Source130: README_SUSE.md +Source140: docker-audit.rules +Source150: docker-daemon.json +Source160: docker.sysusers # NOTE: All of these patches are maintained in # in the suse-v branch. Make sure you update the patches in that # branch and then git-format-patch the patch here. @@ -107,8 +108,8 @@ Obsoletes: docker-libnetwork < 0.7.0.2 Provides: docker-libnetwork = 0.7.0.2.%{version} # Required to actually run containers. We require the minimum version that is # pinned by Docker, but in order to avoid headaches we allow for updates. -Requires: runc >= 1.1.7 -Requires: containerd >= 1.6.21 +Requires: runc >= 1.1.9 +Requires: containerd >= 1.7.3 # Needed for --init support. We don't use "tini", we use our own implementation # which handles edge-cases better. Requires: catatonit @@ -202,7 +203,7 @@ Fish command line completion support for %{name}. %setup -q -n %{name}-%{version}_%{git_version} [ "%{docker_builddir}" = "$PWD" ] # README_SUSE.md for documentation. -cp %{SOURCE103} . +cp %{SOURCE130} . %if 0%{?is_opensuse} == 0 # PATCH-SUSE: Secrets patches. @@ -217,7 +218,7 @@ cp %{SOURCE103} . %patch300 -p1 %build -%sysusers_generate_pre %{SOURCE106} %{name} %{name}.conf +%sysusers_generate_pre %{SOURCE160} %{name} %{name}.conf BUILDTAGS="exclude_graphdriver_aufs apparmor selinux seccomp pkcs11" %if 0%{?sle_version} == 120000 @@ -279,7 +280,7 @@ install -d %{buildroot}/usr/lib/docker/cli-plugins # /var/lib/docker install -d %{buildroot}/%{_localstatedir}/lib/docker # daemon.json config file -install -D -m0644 %{SOURCE105} %{buildroot}%{_sysconfdir}/docker/daemon.json +install -D -m0644 %{SOURCE150} %{buildroot}%{_sysconfdir}/docker/daemon.json # docker cli install -D -m0755 %{cli_builddir}/build/docker %{buildroot}/%{_bindir}/docker @@ -289,17 +290,18 @@ install -D -m0644 %{cli_builddir}/contrib/completion/fish/docker.fish "%{buildro # systemd service install -D -m0644 %{SOURCE100} %{buildroot}%{_unitdir}/%{name}.service +install -D -m0644 %{SOURCE101} %{buildroot}%{_unitdir}/%{name}.socket ln -sf service %{buildroot}%{_sbindir}/rcdocker # udev rules that prevents dolphin to show all docker devices and slows down # upstream report https://bugs.kde.org/show_bug.cgi?id=329930 -install -D -m0644 %{SOURCE101} %{buildroot}%{_udevrulesdir}/80-%{name}.rules +install -D -m0644 %{SOURCE110} %{buildroot}%{_udevrulesdir}/80-%{name}.rules # audit rules -install -D -m0640 %{SOURCE104} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules +install -D -m0640 %{SOURCE140} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules # sysconfig file -install -D -m0644 %{SOURCE102} %{buildroot}%{_fillupdir}/sysconfig.docker +install -D -m0644 %{SOURCE120} %{buildroot}%{_fillupdir}/sysconfig.docker # install manpages (using the ones from the engine) install -d %{buildroot}%{_mandir}/man1 @@ -310,7 +312,7 @@ install -d %{buildroot}%{_mandir}/man8 install -p -m0644 %{cli_builddir}/man/man8/*.8 %{buildroot}%{_mandir}/man8 # sysusers.d -install -D -m0644 %{SOURCE106} %{buildroot}%{_sysusersdir}/%{name}.conf +install -D -m0644 %{SOURCE160} %{buildroot}%{_sysusersdir}/%{name}.conf # rootless extras install -D -p -m 0755 contrib/dockerd-rootless.sh %{buildroot}/%{_bindir}/dockerd-rootless.sh @@ -334,17 +336,17 @@ grep -q '^dockremap:' /etc/subgid || \ usermod -w 100000000-200000000 dockremap &>/dev/null || \ echo "dockremap:100000000:100000001" >>/etc/subgid ||: -%service_add_pre %{name}.service +%service_add_pre %{name}.service %{name}.socket %post -%service_add_post %{name}.service +%service_add_post %{name}.service %{name}.socket %{fillup_only -n docker} %preun -%service_del_preun %{name}.service +%service_del_preun %{name}.service %{name}.socket %postun -%service_del_postun %{name}.service +%service_del_postun %{name}.service %{name}.socket %files %defattr(-,root,root) @@ -360,6 +362,7 @@ grep -q '^dockremap:' /etc/subgid || \ %dir /usr/lib/docker/cli-plugins %{_unitdir}/%{name}.service +%{_unitdir}/%{name}.socket %{_sysusersdir}/%{name}.conf %dir %{_sysconfdir}/docker