diff --git a/apply-patches b/apply-patches index cd12d910bb9b6f2fcaaddba646dda82651432d22..325c2c0255c4581ecc80508e6af26bdc089011c9 100644 --- a/apply-patches +++ b/apply-patches @@ -6,7 +6,7 @@ set -ex -pkg=moby-20.10.23 +pkg=moby-20.10.24 cwd=$PWD src=$cwd/$pkg diff --git a/cli-20.10.23.tar.gz b/cli-20.10.24.tar.gz old mode 100644 new mode 100755 similarity index 51% rename from cli-20.10.23.tar.gz rename to cli-20.10.24.tar.gz index b446ab90358c9c9efff1f42792b481eb1f53a5c8..0915c2c2189383e33ac3ad044d8915e08e851c80 Binary files a/cli-20.10.23.tar.gz and b/cli-20.10.24.tar.gz differ diff --git a/moby-20.10.23.tar.gz b/moby-20.10.24.tar.gz old mode 100644 new mode 100755 similarity index 57% rename from moby-20.10.23.tar.gz rename to moby-20.10.24.tar.gz index 604ae6326b7e153191850f20d48a8321286f81b9..aff18932bdc6954e76919a277d65fadaab3f0df9 Binary files a/moby-20.10.23.tar.gz and b/moby-20.10.24.tar.gz differ diff --git a/moby.spec b/moby.spec index 097004b6c1eb22c5e2d9ae8ffa1b192fa49474e5..d1b95bd6266fea21e9e3011bc041ec9c6a8b9e69 100644 --- a/moby.spec +++ b/moby.spec @@ -1,19 +1,19 @@ -%global _gitcommit_engine 6051f14 -%global _gitcommit_cli 7155243 +%global _gitcommit_engine 5d6db84 +%global _gitcommit_cli 297e128 %global _source_engine moby-%{version} %global _source_client cli-%{version} %global _source_docker_init tini-0.19.0 %global _source_docker_proxy libnetwork-dcdf8f17 Name: docker -Version: 20.10.23 -Release: 3 +Version: 20.10.24 +Release: 1 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com -# https://github.com/docker/cli/archive/refs/tags/v20.10.23.tar.gz +# https://github.com/docker/cli/archive/refs/tags/v20.10.24.tar.gz Source0: cli-%{version}.tar.gz -# https://github.com/moby/moby/archive/refs/tags/v20.10.23.tar.gz +# https://github.com/moby/moby/archive/refs/tags/v20.10.24.tar.gz Source1: moby-%{version}.tar.gz # https://github.com/krallin/tini/archive/refs/tags/v0.19.0.tar.gz Source2: tini-0.19.0.tar.gz @@ -210,6 +210,9 @@ fi %systemd_postun_with_restart docker.service %changelog +* Mon Apr 10 2023 xulei - 20.10.24-1 +- DESC: update to 20.10.24 + * Tue Apr 4 2023 zhangzhihui - 20.10.23-3 - DESC: sync upstream patch Dockerfile: configure code dir as "safe" directory diff --git a/patch/README.md b/patch/README.md new file mode 100644 index 0000000000000000000000000000000000000000..dbd56a08c000daf8a43aa57a8eafcca9fe4f1751 --- /dev/null +++ b/patch/README.md @@ -0,0 +1 @@ +This directory is used to apply patches for the project diff --git a/patch/backport-0001-20.10-update-containerd-binary-to-v1.6.16.patch b/patch/backport-0001-20.10-update-containerd-binary-to-v1.6.16.patch deleted file mode 100644 index 8f786112daf33c0b6f2aeaa704a90312e486bdd9..0000000000000000000000000000000000000000 --- a/patch/backport-0001-20.10-update-containerd-binary-to-v1.6.16.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 526ae907e2828307f54315b184457c64bf1b299d Mon Sep 17 00:00:00 2001 -From: Sebastiaan van Stijn -Date: Mon, 30 Jan 2023 09:17:32 +0100 -Subject: [PATCH] [20.10] update containerd binary to v1.6.16 - -Notable Updates - -- Fix push error propagation -- Fix slice append error with HugepageLimits for Linux -- Update default seccomp profile for PKU and CAP_SYS_NICE -- Fix overlayfs error when upperdirlabel option is set - -full diff: https://github.com/containerd/containerd/compare/v1.6.15...v1.6.16 - -Signed-off-by: Sebastiaan van Stijn ---- - hack/dockerfile/install/containerd.installer | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer -index 1915f8ae35..8bc635be81 100755 ---- a/hack/dockerfile/install/containerd.installer -+++ b/hack/dockerfile/install/containerd.installer -@@ -15,7 +15,7 @@ set -e - # the binary version you may also need to update the vendor version to pick up - # bug fixes or new APIs, however, usually the Go packages are built from a - # commit from the master branch. --: "${CONTAINERD_VERSION:=v1.6.15}" -+: "${CONTAINERD_VERSION:=v1.6.16}" - - install_containerd() ( - echo "Install containerd version $CONTAINERD_VERSION" --- -2.20.1 - diff --git a/patch/backport-0001-Dockerfile-configure-code-dir-as-safe-directory.patch b/patch/backport-0001-Dockerfile-configure-code-dir-as-safe-directory.patch deleted file mode 100644 index f3004768cd528e29b5bf372c96be91c901f2be6b..0000000000000000000000000000000000000000 --- a/patch/backport-0001-Dockerfile-configure-code-dir-as-safe-directory.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0312e468da5c99267654d5c6b62785e29ffe6e0d Mon Sep 17 00:00:00 2001 -From: Sebastiaan van Stijn -Date: Mon, 6 Feb 2023 15:22:09 +0100 -Subject: [PATCH] Dockerfile: configure code dir as "safe" directory - -CI is failing when bind-mounting source from the host into the dev-container; - - fatal: detected dubious ownership in repository at '/go/src/github.com/docker/docker' - To add an exception for this directory, call: - - git config --global --add safe.directory /go/src/github.com/docker/docker - -Signed-off-by: Sebastiaan van Stijn -(cherry picked from commit 21677816a01057bc7c645da8429314d44324ddea) -Signed-off-by: Sebastiaan van Stijn ---- - Dockerfile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Dockerfile b/Dockerfile -index 481c9e288b..96d6393ed7 100644 ---- a/Dockerfile -+++ b/Dockerfile -@@ -267,6 +267,9 @@ RUN ln -sfv /go/src/github.com/docker/docker/.bashrc ~/.bashrc - RUN echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc - RUN ln -s /usr/local/completion/bash/docker /etc/bash_completion.d/docker - RUN ldconfig -+# Set dev environment as safe git directory to prevent "dubious ownership" errors -+# when bind-mounting the source into the dev-container. See https://github.com/moby/moby/pull/44930 -+RUN git config --global --add safe.directory $GOPATH/src/github.com/docker/docker - # This should only install packages that are specifically needed for the dev environment and nothing else - # Do you really need to add another package here? Can it be done in a different build stage? - RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \ --- -2.37.1 - diff --git a/series.conf b/series.conf index f2513f969f7ba94b6f85f25bfd0ee00b8c32ed10..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/series.conf +++ b/series.conf @@ -1,2 +0,0 @@ -patch/backport-0001-20.10-update-containerd-binary-to-v1.6.16.patch -patch/backport-0001-Dockerfile-configure-code-dir-as-safe-directory.patch