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-05-23 14:53:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Tue May 23 14:53:12 2023 rev:131 rq:1088256 version:23.0.6_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2023-04-27 20:00:01.313603637 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new.1533/docker.changes 2023-05-23 14:53:15.942029554 +0200 @@ -1,0 +2,15 @@ +Sun May 21 02:31:35 UTC 2023 - Aleksa Sarai <asa...@suse.com> + +- Update to Docker 23.0.6-ce. See upstream changelog online at + <https://docs.docker.com/engine/release-notes/23.0/#2306>. bsc#1211578 +- Rebase patches: + * cli-0001-docs-include-required-tools-in-source-tree.patch +- Re-unify packaging for SLE-12 and SLE-15. +- Add patch to fix build on SLE-12 by switching back to libbtrfs-devel headers + (the uapi headers in SLE-12 are too old). + + 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch +- Re-numbered patches: + - 0003-bsc1073877-apparmor-clobber-docker-default-profile-o.patch + + 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch` + +------------------------------------------------------------------- Old: ---- 0003-bsc1073877-apparmor-clobber-docker-default-profile-o.patch docker-23.0.5_ce_94d3ad69cc59.tar.xz docker-cli-23.0.5_ce.tar.xz New: ---- 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch docker-23.0.6_ce_9dbdbd4b6d76.tar.xz docker-cli-23.0.6_ce.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.MZi4lE/_old 2023-05-23 14:53:16.622033577 +0200 +++ /var/tmp/diff_new_pack.MZi4lE/_new 2023-05-23 14:53:16.630033625 +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.5 -%define git_version 94d3ad69cc59 -%define git_commit_epoch 1682522945 +%define real_version 23.0.6 +%define git_version 9dbdbd4b6d76 +%define git_commit_epoch 1683319810 Name: docker Version: %{real_version}_ce @@ -57,15 +57,16 @@ Source105: docker-daemon.json Source106: docker.sysusers # NOTE: All of these patches are maintained in <https://github.com/suse/docker> -# in the suse-<version> branch. Make sure you update the patches in that +# in the suse-v<version> branch. Make sure you update the patches in that # branch and then git-format-patch the patch here. # SUSE-FEATURE: Adds the /run/secrets mountpoint inside all Docker containers # which is not snapshotted when images are committed. Patch100: 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch Patch101: 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch -# SUSE-FEATURE: Add support to mirror unofficial/private registries -# <https://github.com/docker/docker/pull/34319>. -Patch300: 0003-bsc1073877-apparmor-clobber-docker-default-profile-o.patch +# UPSTREAM: Revert of upstream patch to keep SLE-12 build working. +Patch200: 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch +# UPSTREAM: Backport of <https://github.com/moby/moby/pull/41954>. +Patch300: 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch # UPSTREAM: Backport of <https://github.com/docker/cli/pull/4228>. Patch900: cli-0001-docs-include-required-tools-in-source-tree.patch BuildRequires: audit @@ -77,6 +78,7 @@ BuildRequires: libbtrfs-devel >= 3.8 BuildRequires: libseccomp-devel >= 2.2 BuildRequires: libtool +BuildRequires: linux-glibc-devel BuildRequires: procps BuildRequires: sqlite3-devel BuildRequires: zsh @@ -85,7 +87,19 @@ BuildRequires: pkgconfig(libsystemd) BuildRequires: sysuser-tools BuildRequires: golang(API) = 1.19 +%if 0%{?sle_version} >= 150000 +# This conditional only works on rpm>=4.13, which SLE 12 doesn't have. But we +# don't need to support Docker+selinux for SLE 12 anyway. Requires: (apparmor-parser or container-selinux) +# This recommends is added to make sure that even if you have container-selinux +# installed you will still be prompted to install apparmor-parser which Docker +# requires to apply AppArmor profiles (for SELinux systems this doesn't matter +# but if you switch back to AppArmor on reboot this would result in insecure +# containers). +Recommends: apparmor-parser +%else +Requires: apparmor-parser +%endif Requires: ca-certificates-mozilla # The docker-proxy binary used to be in a separate package. We obsolete it, # since now docker-proxy is maintained as part of this package. @@ -93,8 +107,8 @@ 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.5 -Requires: containerd >= 1.6.20 +Requires: runc >= 1.1.7 +Requires: containerd >= 1.6.21 # Needed for --init support. We don't use "tini", we use our own implementation # which handles edge-cases better. Requires: catatonit @@ -109,12 +123,6 @@ Requires(post): %fillup_prereq Requires(post): udev Requires(post): shadow -# This recommends is added to make sure that even if you have container-selinux -# installed you will still be prompted to install apparmor-parser which Docker -# requires to apply AppArmor profiles (for SELinux systems this doesn't matter -# but if you switch back to AppArmor on reboot this would result in insecure -# containers). -Recommends: apparmor-parser # Not necessary, but must be installed when the underlying system is # configured to use lvm and the user doesn't explicitly provide a # different storage-driver than devicemapper @@ -184,12 +192,15 @@ %patch100 -p1 %patch101 -p1 %endif +%if 0%{?sle_version} == 120000 +# Patches to build on SLE-12. +%patch200 -p1 +%endif # bsc#1099277 %patch300 -p1 %build %sysusers_generate_pre %{SOURCE106} %{name} %{name}.conf -echo "$PWD -- $PWD -- $PWD" BUILDTAGS="exclude_graphdriver_aufs apparmor selinux seccomp pkcs11" %if 0%{?sle_version} == 120000 ++++++ 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch ++++++ --- /var/tmp/diff_new_pack.MZi4lE/_old 2023-05-23 14:53:16.658033790 +0200 +++ /var/tmp/diff_new_pack.MZi4lE/_new 2023-05-23 14:53:16.666033837 +0200 @@ -1,7 +1,7 @@ -From 5c6812a104e161599fc8569d0b4af04224ef3b5a Mon Sep 17 00:00:00 2001 +From e4410ba60f96f1d57d088208eaedd12c0fca6b80 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/3] SECRETS: daemon: allow directory creation in /run/secrets +Subject: [PATCH 1/4] SECRETS: daemon: allow directory creation in /run/secrets Since FileMode can have the directory bit set, allow a SecretStore implementation to return secrets that are actually directories. This is @@ -69,6 +69,6 @@ return errors.Wrap(err, "error setting ownership for secret") } -- -2.40.0 +2.40.1 ++++++ 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch ++++++ --- /var/tmp/diff_new_pack.MZi4lE/_old 2023-05-23 14:53:16.682033932 +0200 +++ /var/tmp/diff_new_pack.MZi4lE/_new 2023-05-23 14:53:16.686033955 +0200 @@ -1,7 +1,7 @@ -From 4138c02a19fbd3d3ff50f0b364bf4b99adc47298 Mon Sep 17 00:00:00 2001 +From 3b56cce3fab96f60ef8dcb40fe143159c519e97a 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/3] SECRETS: SUSE: implement SUSE container secrets +Subject: [PATCH 2/4] SECRETS: SUSE: implement SUSE container secrets This allows for us to pass in host credentials to a container, allowing for SUSEConnect to work with containers. @@ -456,6 +456,6 @@ + return nil +} -- -2.40.0 +2.40.1 ++++++ 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch ++++++ >From a5bb4ed6a9dd6f3e859524bcc44a822fdeb779fc 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 headers" This reverts commit 3208dcabdc8997340b255f5b880fef4e3f54580d. On SLE 12, our UAPI headers are too old, resulting in us being unable to build the btrfs driver with the new headers. This patch is only needed for SLE-12. Signed-off-by: Aleksa Sarai <cyp...@cyphar.com> --- daemon/graphdriver/btrfs/btrfs.go | 13 ++++--------- 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 --- 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" /* #include <stdlib.h> -#include <stdio.h> #include <dirent.h> -#include <linux/version.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0) - #error "Headers from kernel >= 4.12 are required to build with Btrfs support." - #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs." -#endif - -#include <linux/btrfs.h> -#include <linux/btrfs_tree.h> +// keep struct field name compatible with btrfs-progs < 6.1. +#define max_referenced max_rfer +#include <btrfs/ioctl.h> +#include <btrfs/ctree.h> 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 ++++++ 0003-bsc1073877-apparmor-clobber-docker-default-profile-o.patch -> 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch ++++++ --- /work/SRC/openSUSE:Factory/docker/0003-bsc1073877-apparmor-clobber-docker-default-profile-o.patch 2023-04-27 20:00:00.513598934 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new.1533/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch 2023-05-23 14:53:15.534027139 +0200 @@ -1,7 +1,7 @@ -From 3e37bbad6f0a0c2576ad0b9dfe7a4a9290aa2aa0 Mon Sep 17 00:00:00 2001 +From 81648019f140e161dd723774ce206d40fb697ba3 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Fri, 29 Jun 2018 17:59:30 +1000 -Subject: [PATCH 3/3] bsc1073877: apparmor: clobber docker-default profile on +Subject: [PATCH 4/4] bsc1073877: apparmor: clobber docker-default profile on start In the process of making docker-default reloading far less expensive, @@ -85,5 +85,5 @@ } -- -2.40.0 +2.40.1 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.MZi4lE/_old 2023-05-23 14:53:16.758034382 +0200 +++ /var/tmp/diff_new_pack.MZi4lE/_new 2023-05-23 14:53:16.762034405 +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.5_ce_%h</param> - <param name="revision">v23.0.5</param> + <param name="versionformat">23.0.6_ce_%h</param> + <param name="revision">v23.0.6</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.5_ce</param> - <param name="revision">v23.0.5</param> + <param name="versionformat">23.0.6_ce</param> + <param name="revision">v23.0.6</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.MZi4lE/_old 2023-05-23 14:53:16.778034500 +0200 +++ /var/tmp/diff_new_pack.MZi4lE/_new 2023-05-23 14:53:16.782034524 +0200 @@ -1,4 +1,4 @@ -From 0c35d956eb289bd6186e2865a779d2615c471b94 Mon Sep 17 00:00:00 2001 +From f571ed4f350621b20280e74bf663535533246511 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 | 32 +- - scripts/docs/generate-md.sh | 23 +- - scripts/docs/generate-yaml.sh | 28 +- + scripts/docs/generate-man.sh | 35 +- + scripts/docs/generate-md.sh | 28 +- + scripts/docs/generate-yaml.sh | 31 +- 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, 22956 insertions(+), 119 deletions(-) + 71 files changed, 22969 insertions(+), 117 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..128828f50342 100755 +index 6afed3fa8708..6abac3b1d28e 100755 --- a/scripts/docs/generate-man.sh +++ b/scripts/docs/generate-man.sh -@@ -1,35 +1,13 @@ +@@ -1,35 +1,18 @@ #!/usr/bin/env bash -set -eu @@ -270,7 +270,11 @@ - -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 + -( - set -x - cp -r . "$buildir/" @@ -296,10 +300,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..327a06aa4c24 100755 +index a947bb969673..0e4e231e5c8e 100755 --- a/scripts/docs/generate-md.sh +++ b/scripts/docs/generate-md.sh -@@ -1,36 +1,19 @@ +@@ -1,36 +1,24 @@ #!/usr/bin/env bash -set -eu @@ -334,16 +338,21 @@ - # 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..3f3f7df8b140 100755 +index 4d0006e43e79..abebc183d49c 100755 --- a/scripts/docs/generate-yaml.sh +++ b/scripts/docs/generate-yaml.sh -@@ -1,33 +1,11 @@ +@@ -1,33 +1,16 @@ #!/usr/bin/env bash -set -eu @@ -359,7 +368,11 @@ - -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 + -( - set -x - cp -r . "$buildir/" @@ -381,7 +394,7 @@ mkdir -p docs/yaml set -x diff --git a/vendor.mod b/vendor.mod -index da1d033bff0b..61034043c05e 100644 +index eed166a6de6b..993aca7af845 100644 --- a/vendor.mod +++ b/vendor.mod @@ -8,7 +8,9 @@ go 1.18 @@ -392,7 +405,7 @@ github.com/creack/pty v1.1.11 + github.com/docker/cli-docs-tool v0.5.1 github.com/docker/distribution v2.8.1+incompatible - github.com/docker/docker v23.0.4+incompatible + github.com/docker/docker v23.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 @@ -409,7 +422,7 @@ + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/vendor.sum b/vendor.sum -index 91aae7c1487c..ad0005735231 100644 +index 6edc40179f41..c5e8b1e9ea76 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 @@ -23703,7 +23716,7 @@ + +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 520bc4ca95e0..e744937180df 100644 +index 807b468777dc..0d69cb4dbed5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -18,9 +18,17 @@ github.com/containerd/containerd/errdefs @@ -23752,6 +23765,6 @@ ## explicit; go 1.13 gotest.tools/v3/assert -- -2.40.0 +2.40.1 ++++++ docker-23.0.5_ce_94d3ad69cc59.tar.xz -> docker-23.0.6_ce_9dbdbd4b6d76.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-23.0.5_ce_94d3ad69cc59.tar.xz /work/SRC/openSUSE:Factory/.docker.new.1533/docker-23.0.6_ce_9dbdbd4b6d76.tar.xz differ: char 15, line 1 ++++++ docker-cli-23.0.5_ce.tar.xz -> docker-cli-23.0.6_ce.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/.github/workflows/test.yml new/docker-cli-23.0.6_ce/.github/workflows/test.yml --- old/docker-cli-23.0.5_ce/.github/workflows/test.yml 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/.github/workflows/test.yml 2023-05-04 12:51:27.000000000 +0200 @@ -63,7 +63,7 @@ name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: 1.19.9 - name: Test run: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/Dockerfile new/docker-cli-23.0.6_ce/Dockerfile --- old/docker-cli-23.0.5_ce/Dockerfile 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/Dockerfile 2023-05-04 12:51:27.000000000 +0200 @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG BASE_VARIANT=alpine -ARG GO_VERSION=1.19.8 +ARG GO_VERSION=1.19.9 ARG ALPINE_VERSION=3.16 ARG XX_VERSION=1.1.1 ARG GOVERSIONINFO_VERSION=v1.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/docker-bake.hcl new/docker-cli-23.0.6_ce/docker-bake.hcl --- old/docker-cli-23.0.5_ce/docker-bake.hcl 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/docker-bake.hcl 2023-05-04 12:51:27.000000000 +0200 @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.19.8" + default = "1.19.9" } variable "VERSION" { default = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/dockerfiles/Dockerfile.dev new/docker-cli-23.0.6_ce/dockerfiles/Dockerfile.dev --- old/docker-cli-23.0.5_ce/dockerfiles/Dockerfile.dev 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/dockerfiles/Dockerfile.dev 2023-05-04 12:51:27.000000000 +0200 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.19.8 +ARG GO_VERSION=1.19.9 ARG ALPINE_VERSION=3.16 ARG BUILDX_VERSION=0.10.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/dockerfiles/Dockerfile.lint new/docker-cli-23.0.6_ce/dockerfiles/Dockerfile.lint --- old/docker-cli-23.0.5_ce/dockerfiles/Dockerfile.lint 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/dockerfiles/Dockerfile.lint 2023-05-04 12:51:27.000000000 +0200 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.19.8 +ARG GO_VERSION=1.19.9 ARG ALPINE_VERSION=3.16 ARG GOLANGCI_LINT_VERSION=v1.49.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/dockerfiles/Dockerfile.vendor new/docker-cli-23.0.6_ce/dockerfiles/Dockerfile.vendor --- old/docker-cli-23.0.5_ce/dockerfiles/Dockerfile.vendor 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/dockerfiles/Dockerfile.vendor 2023-05-04 12:51:27.000000000 +0200 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.19.8 +ARG GO_VERSION=1.19.9 ARG ALPINE_VERSION=3.16 ARG MODOUTDATED_VERSION=v0.8.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/e2e/testdata/Dockerfile.gencerts new/docker-cli-23.0.6_ce/e2e/testdata/Dockerfile.gencerts --- old/docker-cli-23.0.5_ce/e2e/testdata/Dockerfile.gencerts 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/e2e/testdata/Dockerfile.gencerts 2023-05-04 12:51:27.000000000 +0200 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.19.8 +ARG GO_VERSION=1.19.9 FROM golang:${GO_VERSION}-alpine AS generated RUN go install github.com/dmcgowan/quicktls@master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/vendor/github.com/docker/docker/client/client.go new/docker-cli-23.0.6_ce/vendor/github.com/docker/docker/client/client.go --- old/docker-cli-23.0.5_ce/vendor/github.com/docker/docker/client/client.go 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/vendor/github.com/docker/docker/client/client.go 2023-05-04 12:51:27.000000000 +0200 @@ -6,9 +6,10 @@ # Usage -You use the library by creating a client object and calling methods on it. The -client can be created either from environment variables with NewClientWithOpts(client.FromEnv), -or configured manually with NewClient(). +You use the library by constructing a client object using [NewClientWithOpts] +and calling methods on it. The client can be configured from environment +variables by passing the [FromEnv] option, or configured manually by passing any +of the other available [Opts]. For example, to list running containers (the equivalent of "docker ps"): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/vendor/github.com/docker/docker/client/client_deprecated.go new/docker-cli-23.0.6_ce/vendor/github.com/docker/docker/client/client_deprecated.go --- old/docker-cli-23.0.5_ce/vendor/github.com/docker/docker/client/client_deprecated.go 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/vendor/github.com/docker/docker/client/client_deprecated.go 2023-05-04 12:51:27.000000000 +0200 @@ -9,7 +9,11 @@ // It won't send any version information if the version number is empty. It is // highly recommended that you set a version or your client may break if the // server is upgraded. -// Deprecated: use NewClientWithOpts +// +// Deprecated: use [NewClientWithOpts] passing the [WithHost], [WithVersion], +// [WithHTTPClient] and [WithHTTPHeaders] options. We recommend enabling API +// version negotiation by passing the [WithAPIVersionNegotiation] option instead +// of WithVersion. func NewClient(host string, version string, client *http.Client, httpHeaders map[string]string) (*Client, error) { return NewClientWithOpts(WithHost(host), WithVersion(version), WithHTTPClient(client), WithHTTPHeaders(httpHeaders)) } @@ -17,7 +21,7 @@ // NewEnvClient initializes a new API client based on environment variables. // See FromEnv for a list of support environment variables. // -// Deprecated: use NewClientWithOpts(FromEnv) +// Deprecated: use [NewClientWithOpts] passing the [FromEnv] option. func NewEnvClient() (*Client, error) { return NewClientWithOpts(FromEnv) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/vendor/modules.txt new/docker-cli-23.0.6_ce/vendor/modules.txt --- old/docker-cli-23.0.5_ce/vendor/modules.txt 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/vendor/modules.txt 2023-05-04 12:51:27.000000000 +0200 @@ -40,7 +40,7 @@ github.com/docker/distribution/registry/storage/cache github.com/docker/distribution/registry/storage/cache/memory github.com/docker/distribution/uuid -# github.com/docker/docker v23.0.4+incompatible +# github.com/docker/docker v23.0.5+incompatible ## explicit github.com/docker/docker/api github.com/docker/docker/api/types @@ -164,7 +164,7 @@ # github.com/moby/patternmatcher v0.5.0 ## explicit; go 1.19 github.com/moby/patternmatcher -# github.com/moby/swarmkit/v2 v2.0.0-20230309194213-a745a8755ce3 +# github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 ## explicit; go 1.18 github.com/moby/swarmkit/v2/api github.com/moby/swarmkit/v2/api/deepcopy @@ -195,7 +195,7 @@ ## explicit; go 1.16 github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 -# github.com/opencontainers/runc v1.1.3 +# github.com/opencontainers/runc v1.1.5 ## explicit; go 1.16 github.com/opencontainers/runc/libcontainer/user # github.com/pkg/errors v0.9.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/vendor.mod new/docker-cli-23.0.6_ce/vendor.mod --- old/docker-cli-23.0.5_ce/vendor.mod 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/vendor.mod 2023-05-04 12:51:27.000000000 +0200 @@ -10,7 +10,7 @@ github.com/containerd/containerd v1.6.19 github.com/creack/pty v1.1.11 github.com/docker/distribution v2.8.1+incompatible - github.com/docker/docker v23.0.4+incompatible + github.com/docker/docker v23.0.5+incompatible github.com/docker/docker-credential-helpers v0.7.0 github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.5.0 @@ -23,7 +23,7 @@ github.com/mitchellh/mapstructure v1.3.2 github.com/moby/buildkit v0.10.6 github.com/moby/patternmatcher v0.5.0 - github.com/moby/swarmkit/v2 v2.0.0-20230309194213-a745a8755ce3 + github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 github.com/moby/sys/sequential v0.5.0 github.com/moby/sys/signal v0.7.0 github.com/moby/term v0.0.0-20221128092401-c43b287e0e0f @@ -61,7 +61,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/miekg/pkcs11 v1.1.1 // indirect github.com/moby/sys/symlink v0.2.0 // indirect - github.com/opencontainers/runc v1.1.3 // indirect + github.com/opencontainers/runc v1.1.5 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-cli-23.0.5_ce/vendor.sum new/docker-cli-23.0.6_ce/vendor.sum --- old/docker-cli-23.0.5_ce/vendor.sum 2023-04-26 16:46:06.000000000 +0200 +++ new/docker-cli-23.0.6_ce/vendor.sum 2023-05-04 12:51:27.000000000 +0200 @@ -101,8 +101,8 @@ 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= -github.com/docker/docker v23.0.4+incompatible h1:Kd3Bh9V/rO+XpTP/BLqM+gx8z7+Yb0AA2Ibj+nNo4ek= -github.com/docker/docker v23.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v23.0.5+incompatible h1:DaxtlTJjFSnLOXVNUBU1+6kXGz2lpDoEAH6QoxaSg8k= +github.com/docker/docker v23.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0= @@ -283,8 +283,8 @@ github.com/moby/buildkit v0.10.6/go.mod h1:tQuuyTWtOb9D+RE425cwOCUkX0/oZ+5iBZ+uWpWQ9bU= github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo= github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/swarmkit/v2 v2.0.0-20230309194213-a745a8755ce3 h1:05e6sB9az9OINsgqSy1PiSC9i0ffkpfQd0oJGAigo6k= -github.com/moby/swarmkit/v2 v2.0.0-20230309194213-a745a8755ce3/go.mod h1:GvjR7mC8YuUd9Mq44lrrIZPaXyKPAGEUMBpAQzaj3dI= +github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 h1:jUbNDiRMDXd2rYoa4bcI+g3nIb4A1R8HNCe9wdCdh8I= +github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83/go.mod h1:GvjR7mC8YuUd9Mq44lrrIZPaXyKPAGEUMBpAQzaj3dI= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= @@ -315,8 +315,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 h1:9iFHD5Kt9hkOfeawBNiEeEaV7bmC4/Z5wJp8E9BptMs= github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1/go.mod h1:K/JAU0m27RFhDRX4PcFdIKntROP6y5Ed6O91aZYDQfs= -github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= -github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= +github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= +github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
