Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2023-06-17 22:20:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Sat Jun 17 22:20:10 2023 rev:132 rq:1093356 version:24.0.2_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2023-05-23 14:53:15.942029554 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new.15902/docker.changes 2023-06-17 22:20:22.435559832 +0200 @@ -1,0 +2,15 @@ +Wed Jun 14 13:02:01 UTC 2023 - Aleksa Sarai <asa...@suse.com> + +- Update to Docker 24.0.2-ce. See upstream changelog online at + <https://docs.docker.com/engine/release-notes/24.0/#2402>. bsc#1212368 + bsc#1210797 +- Add Recommends for docker-buildx, and add /usr/lib/docker/cli-plugins as + being provided by this package. +- 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 + +------------------------------------------------------------------- Old: ---- docker-23.0.6_ce_9dbdbd4b6d76.tar.xz docker-cli-23.0.6_ce.tar.xz New: ---- docker-24.0.2_ce_659604f9ee60.tar.xz docker-cli-24.0.2_ce.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.VAqUpK/_old 2023-06-17 22:20:23.875568486 +0200 +++ /var/tmp/diff_new_pack.VAqUpK/_new 2023-06-17 22:20:23.879568509 +0200 @@ -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 23.0.6 -%define git_version 9dbdbd4b6d76 -%define git_commit_epoch 1683319810 +%define real_version 24.0.2 +%define git_version 659604f9ee60 +%define git_commit_epoch 1685049742 Name: docker Version: %{real_version}_ce @@ -128,6 +128,8 @@ # different storage-driver than devicemapper Recommends: lvm2 >= 2.2.89 Recommends: git-core >= 1.7 +# Required for "docker buildx" support. +Recommends: docker-buildx ExcludeArch: s390 ppc %description @@ -256,6 +258,9 @@ # docker proxy install -D -m0755 %{docker_builddir}/bundles/dynbinary-daemon/docker-proxy %{buildroot}/%{_bindir}/docker-proxy +# cli-plugins/ +install -d %{buildroot}/usr/lib/docker/cli-plugins + # /var/lib/docker install -d %{buildroot}/%{_localstatedir}/lib/docker # daemon.json config file @@ -332,6 +337,9 @@ %{_sbindir}/rcdocker %dir %{_localstatedir}/lib/docker/ +%dir /usr/lib/docker +%dir /usr/lib/docker/cli-plugins + %{_unitdir}/%{name}.service %{_sysusersdir}/%{name}.conf ++++++ 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch ++++++ --- /var/tmp/diff_new_pack.VAqUpK/_old 2023-06-17 22:20:23.907568677 +0200 +++ /var/tmp/diff_new_pack.VAqUpK/_new 2023-06-17 22:20:23.907568677 +0200 @@ -1,4 +1,4 @@ -From e4410ba60f96f1d57d088208eaedd12c0fca6b80 Mon Sep 17 00:00:00 2001 +From 2e2fdee74ce8572ff90f213a444ece63248fa01c Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Wed, 8 Mar 2017 12:41:54 +1100 Subject: [PATCH 1/4] SECRETS: daemon: allow directory creation in /run/secrets @@ -14,7 +14,7 @@ 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go -index 561077b66b60..0b70825dd2ff 100644 +index 290ec59a34a7..b7013fb89c83 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -4,6 +4,7 @@ @@ -31,8 +31,8 @@ "github.com/docker/docker/libnetwork" + "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/idtools" + "github.com/docker/docker/pkg/process" "github.com/docker/docker/pkg/stringid" - "github.com/docker/docker/pkg/system" @@ -206,9 +208,6 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) { if err != nil { return errors.Wrap(err, "unable to get secret from secret store") ++++++ 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch ++++++ --- /var/tmp/diff_new_pack.VAqUpK/_old 2023-06-17 22:20:23.919568749 +0200 +++ /var/tmp/diff_new_pack.VAqUpK/_new 2023-06-17 22:20:23.923568774 +0200 @@ -1,4 +1,4 @@ -From 3b56cce3fab96f60ef8dcb40fe143159c519e97a Mon Sep 17 00:00:00 2001 +From bc80631658b8b9b94ca7cf7fc6b8234e6547e947 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Wed, 8 Mar 2017 11:43:29 +1100 Subject: [PATCH 2/4] SECRETS: SUSE: implement SUSE container secrets @@ -19,10 +19,10 @@ create mode 100644 daemon/suse_secrets.go diff --git a/daemon/start.go b/daemon/start.go -index 9d6f7812b67c..53c42082c5bf 100644 +index 0b4eb6d67bcc..0bcecba31386 100644 --- a/daemon/start.go +++ b/daemon/start.go -@@ -150,6 +150,11 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint +@@ -152,6 +152,11 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C return err } @@ -31,7 +31,7 @@ + return errdefs.System(err) + } + - spec, err := daemon.createSpec(container) + spec, err := daemon.createSpec(ctx, container) if err != nil { return errdefs.System(err) diff --git a/daemon/suse_secrets.go b/daemon/suse_secrets.go ++++++ 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch ++++++ --- /var/tmp/diff_new_pack.VAqUpK/_old 2023-06-17 22:20:23.935568846 +0200 +++ /var/tmp/diff_new_pack.VAqUpK/_new 2023-06-17 22:20:23.939568870 +0200 @@ -1,4 +1,4 @@ -From a5bb4ed6a9dd6f3e859524bcc44a822fdeb779fc Mon Sep 17 00:00:00 2001 +From 16b520570514380a706fc13363b5e5c64f9fa4e7 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Mon, 22 May 2023 15:44:54 +1000 Subject: [PATCH 3/4] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI @@ -16,7 +16,7 @@ 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go -index 7f82594b4ebd..532c19a8a15c 100644 +index d88efc4be2bb..4e976aa689cd 100644 --- a/daemon/graphdriver/btrfs/btrfs.go +++ b/daemon/graphdriver/btrfs/btrfs.go @@ -5,17 +5,12 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" ++++++ 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch ++++++ --- /var/tmp/diff_new_pack.VAqUpK/_old 2023-06-17 22:20:23.947568918 +0200 +++ /var/tmp/diff_new_pack.VAqUpK/_new 2023-06-17 22:20:23.951568942 +0200 @@ -1,4 +1,4 @@ -From 81648019f140e161dd723774ce206d40fb697ba3 Mon Sep 17 00:00:00 2001 +From 45cbecbd3ee7b4f21ce32c16979631b6d87b6cf6 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Fri, 29 Jun 2018 17:59:30 +1000 Subject: [PATCH 4/4] bsc1073877: apparmor: clobber docker-default profile on @@ -69,10 +69,10 @@ return nil } diff --git a/daemon/daemon.go b/daemon/daemon.go -index 40abbe8cc19c..05c6db818c30 100644 +index 9be2f289696a..25fa052310e2 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go -@@ -807,8 +807,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S +@@ -836,8 +836,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S logrus.Warnf("Failed to configure golang's threads limit: %v", err) } ++++++ _service ++++++ --- /var/tmp/diff_new_pack.VAqUpK/_old 2023-06-17 22:20:24.003569254 +0200 +++ /var/tmp/diff_new_pack.VAqUpK/_new 2023-06-17 22:20:24.007569279 +0200 @@ -3,16 +3,16 @@ <param name="url">https://github.com/moby/moby.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">23.0.6_ce_%h</param> - <param name="revision">v23.0.6</param> + <param name="versionformat">24.0.2_ce_%h</param> + <param name="revision">v24.0.2</param> <param name="filename">docker</param> </service> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/docker/cli.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">23.0.6_ce</param> - <param name="revision">v23.0.6</param> + <param name="versionformat">24.0.2_ce</param> + <param name="revision">v24.0.2</param> <param name="filename">docker-cli</param> </service> <service name="recompress" mode="disabled"> ++++++ cli-0001-docs-include-required-tools-in-source-tree.patch ++++++ --- /var/tmp/diff_new_pack.VAqUpK/_old 2023-06-17 22:20:24.023569375 +0200 +++ /var/tmp/diff_new_pack.VAqUpK/_new 2023-06-17 22:20:24.027569399 +0200 @@ -1,4 +1,4 @@ -From f571ed4f350621b20280e74bf663535533246511 Mon Sep 17 00:00:00 2001 +From c46107746f7676a09590008584a17d3f907f7926 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Wed, 26 Apr 2023 10:13:48 +1000 Subject: [PATCH] docs: include required tools in source tree @@ -23,9 +23,9 @@ import.go | 17 + man/go.mod | 15 - man/tools.go | 11 - - scripts/docs/generate-man.sh | 35 +- - scripts/docs/generate-md.sh | 28 +- - scripts/docs/generate-yaml.sh | 31 +- + scripts/docs/generate-man.sh | 33 +- + scripts/docs/generate-md.sh | 27 +- + scripts/docs/generate-yaml.sh | 29 +- vendor.mod | 4 + vendor.sum | 4 + .../cpuguy83/go-md2man/v2/.gitignore | 2 + @@ -89,7 +89,7 @@ vendor/gopkg.in/yaml.v3/yamlh.go | 807 +++++ vendor/gopkg.in/yaml.v3/yamlprivateh.go | 198 ++ vendor/modules.txt | 15 + - 71 files changed, 22969 insertions(+), 117 deletions(-) + 71 files changed, 22970 insertions(+), 111 deletions(-) delete mode 100644 docs/generate/go.mod delete mode 100644 docs/generate/tools.go create mode 100644 import.go @@ -251,10 +251,10 @@ - _ "github.com/spf13/pflag" -) diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh -index 6afed3fa8708..6abac3b1d28e 100755 +index 6afed3fa8708..1e12a95e9c9a 100755 --- a/scripts/docs/generate-man.sh +++ b/scripts/docs/generate-man.sh -@@ -1,35 +1,18 @@ +@@ -1,35 +1,22 @@ #!/usr/bin/env bash -set -eu @@ -266,14 +266,15 @@ -function clean { - rm -rf "$buildir" --} -- --buildir=$(mktemp -d -t docker-cli-docsgen.XXXXXXXXXX) --trap clean EXIT +# temporary "go.mod" to make -modfile= work +touch go.mod -+# shellcheck disable=SC2064 -+trap "rm -f $(pwd)/go.mod" EXIT ++ ++function clean() { ++ rm -f "$(pwd)/go.mod" + } + +-buildir=$(mktemp -d -t docker-cli-docsgen.XXXXXXXXXX) + trap clean EXIT -( - set -x @@ -300,10 +301,10 @@ mkdir -p man/man1 (set -x ; /tmp/gen-manpages --root "." --target "$(pwd)/man/man1") diff --git a/scripts/docs/generate-md.sh b/scripts/docs/generate-md.sh -index a947bb969673..0e4e231e5c8e 100755 +index a947bb969673..0af86843bbe4 100755 --- a/scripts/docs/generate-md.sh +++ b/scripts/docs/generate-md.sh -@@ -1,36 +1,24 @@ +@@ -1,36 +1,23 @@ #!/usr/bin/env bash -set -eu @@ -313,8 +314,12 @@ export GO111MODULE=auto ++# temporary "go.mod" to make -modfile= work ++touch go.mod ++ function clean { - rm -rf "$buildir" ++ rm -f "$(pwd)/go.mod" if [ -f "$(pwd)/docs/reference/commandline/docker.md" ]; then mv "$(pwd)/docs/reference/commandline/docker.md" "$(pwd)/docs/reference/commandline/cli.md" fi @@ -338,21 +343,16 @@ - # build docsgen - go build -mod=vendor -modfile=vendor.mod -tags docsgen -o /tmp/docsgen ./docs/generate/generate.go -) -+# temporary "go.mod" to make -modfile= work -+touch go.mod -+# shellcheck disable=SC2064 -+trap "rm -f $(pwd)/go.mod" EXIT -+ +# build docsgen +go build -mod=vendor -modfile=vendor.mod -tags docsgen -o /tmp/docsgen ./docs/generate/generate.go # 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 diff --git a/scripts/docs/generate-yaml.sh b/scripts/docs/generate-yaml.sh -index 4d0006e43e79..abebc183d49c 100755 +index 4d0006e43e79..7d98e161df5d 100755 --- a/scripts/docs/generate-yaml.sh +++ b/scripts/docs/generate-yaml.sh -@@ -1,33 +1,16 @@ +@@ -1,33 +1,20 @@ #!/usr/bin/env bash -set -eu @@ -364,14 +364,15 @@ -function clean { - rm -rf "$buildir" --} -- --buildir=$(mktemp -d -t docker-cli-docsgen.XXXXXXXXXX) --trap clean EXIT +# temporary "go.mod" to make -modfile= work +touch go.mod -+# shellcheck disable=SC2064 -+trap "rm -f $(pwd)/go.mod" EXIT ++ ++function clean() { ++ rm -f "$(pwd)/go.mod" + } + +-buildir=$(mktemp -d -t docker-cli-docsgen.XXXXXXXXXX) + trap clean EXIT -( - set -x @@ -394,18 +395,18 @@ mkdir -p docs/yaml set -x diff --git a/vendor.mod b/vendor.mod -index eed166a6de6b..993aca7af845 100644 +index 9b171b28e5b3..0aeec6f36cc5 100644 --- a/vendor.mod +++ b/vendor.mod @@ -8,7 +8,9 @@ go 1.18 require ( - github.com/containerd/containerd v1.6.19 + github.com/containerd/containerd v1.6.21 + github.com/cpuguy83/go-md2man/v2 v2.0.2 - github.com/creack/pty v1.1.11 + github.com/creack/pty v1.1.18 + github.com/docker/cli-docs-tool v0.5.1 - github.com/docker/distribution v2.8.1+incompatible - github.com/docker/docker v23.0.5+incompatible + github.com/docker/distribution v2.8.2+incompatible + github.com/docker/docker v24.0.1+incompatible github.com/docker/docker-credential-helpers v0.7.0 @@ -67,6 +69,7 @@ require ( github.com/prometheus/common v0.37.0 // indirect @@ -417,39 +418,39 @@ go.etcd.io/etcd/raft/v3 v3.5.6 // indirect @@ -76,4 +79,5 @@ require ( google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 // indirect - google.golang.org/grpc v1.48.0 // indirect + google.golang.org/grpc v1.50.1 // indirect google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/vendor.sum b/vendor.sum -index 6edc40179f41..c5e8b1e9ea76 100644 +index adb8ce424999..b577d7bb7242 100644 --- a/vendor.sum +++ b/vendor.sum -@@ -89,6 +89,7 @@ github.com/containerd/containerd v1.6.19/go.mod h1:HZCDMn4v/Xl2579/MvtOC2M206i+J - github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= +@@ -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= - github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= 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.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= -@@ -98,6 +99,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs + github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +@@ -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/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= - github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= - github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -@@ -366,6 +369,7 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L + 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: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= - github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= - github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= - github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= - github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= + github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= + github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= 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 @@ -10882,11 +10883,11 @@ +You may call `cmd.InitDefaultCompletionCmd()` to document the default autocompletion command. 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..b5a2c596e96f +index 000000000000..b8c15ce88543 --- /dev/null +++ b/vendor/github.com/spf13/cobra/doc/man_docs.go @@ -0,0 +1,246 @@ -+// Copyright 2013-2022 The Cobra Authors ++// Copyright 2013-2023 The Cobra Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. @@ -11171,11 +11172,11 @@ +That will get you a man page `/tmp/test.3` 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..bab4b496368c +index 000000000000..c4a27c00935b --- /dev/null +++ b/vendor/github.com/spf13/cobra/doc/md_docs.go @@ -0,0 +1,156 @@ -+// Copyright 2013-2022 The Cobra Authors ++// Copyright 2013-2023 The Cobra Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. @@ -11454,11 +11455,11 @@ +``` 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..d65890652dde +index 000000000000..2cca6fd778de --- /dev/null +++ b/vendor/github.com/spf13/cobra/doc/rest_docs.go @@ -0,0 +1,186 @@ -+// Copyright 2013-2022 The Cobra Authors ++// Copyright 2013-2023 The Cobra Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. @@ -11508,7 +11509,7 @@ + return nil +} + -+// linkHandler for default ReST hyperlink markup ++// defaultLinkHandler for default ReST hyperlink markup +func defaultLinkHandler(name, ref string) string { + return fmt.Sprintf("`%s <%s.rst>`_", name, ref) +} @@ -11629,7 +11630,7 @@ + return nil +} + -+// adapted from: https://github.com/kr/text/blob/main/indent.go ++// indentString adapted from: https://github.com/kr/text/blob/main/indent.go +func indentString(s, p string) string { + var res []byte + b := []byte(s) @@ -11766,11 +11767,11 @@ +``` 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..499ecdd919b9 +index 000000000000..0aaa07a166d8 --- /dev/null +++ b/vendor/github.com/spf13/cobra/doc/util.go @@ -0,0 +1,52 @@ -+// Copyright 2013-2022 The Cobra Authors ++// Copyright 2013-2023 The Cobra Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. @@ -11824,11 +11825,11 @@ +func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() } 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..12f8cf33b8f2 +index 000000000000..2b26d6ec0f3e --- /dev/null +++ b/vendor/github.com/spf13/cobra/doc/yaml_docs.go @@ -0,0 +1,175 @@ -+// Copyright 2013-2022 The Cobra Authors ++// Copyright 2013-2023 The Cobra Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. @@ -23716,7 +23717,7 @@ + +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 807b468777dc..0d69cb4dbed5 100644 +index 5fc4fe641043..8dfd03ef0dd2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -18,9 +18,17 @@ github.com/containerd/containerd/errdefs @@ -23727,17 +23728,17 @@ +## explicit; go 1.11 +github.com/cpuguy83/go-md2man/v2 +github.com/cpuguy83/go-md2man/v2/md2man - # github.com/creack/pty v1.1.11 + # github.com/creack/pty v1.1.18 ## explicit; go 1.13 github.com/creack/pty +# github.com/docker/cli-docs-tool v0.5.1 +## explicit; go 1.18 +github.com/docker/cli-docs-tool +github.com/docker/cli-docs-tool/annotation - # github.com/docker/distribution v2.8.1+incompatible + # github.com/docker/distribution v2.8.2+incompatible ## explicit github.com/docker/distribution -@@ -222,12 +230,16 @@ github.com/prometheus/procfs/internal/util +@@ -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 @@ -23747,14 +23748,14 @@ # github.com/sirupsen/logrus v1.9.0 ## explicit; go 1.13 github.com/sirupsen/logrus - # github.com/spf13/cobra v1.6.1 + # github.com/spf13/cobra v1.7.0 ## explicit; go 1.15 github.com/spf13/cobra +github.com/spf13/cobra/doc # github.com/spf13/pflag v1.0.5 ## explicit; go 1.12 github.com/spf13/pflag -@@ -389,6 +401,9 @@ google.golang.org/protobuf/types/known/timestamppb +@@ -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 ++++++ docker-23.0.6_ce_9dbdbd4b6d76.tar.xz -> docker-24.0.2_ce_659604f9ee60.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-23.0.6_ce_9dbdbd4b6d76.tar.xz /work/SRC/openSUSE:Factory/.docker.new.15902/docker-24.0.2_ce_659604f9ee60.tar.xz differ: char 15, line 1 ++++++ docker-cli-23.0.6_ce.tar.xz -> docker-cli-24.0.2_ce.tar.xz ++++++ ++++ 25117 lines of diff (skipped)
