update to 20.10.24

apply-patches

@@ -6,7 +6,7 @@
 
 set -ex
 
-pkg=moby-20.10.23
+pkg=moby-20.10.24
 cwd=$PWD
 src=$cwd/$pkg
 

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<xulei@xfusion.com> - 20.10.24-1
+- DESC: update to 20.10.24
+
 * Tue Apr 4 2023 zhangzhihui<zhangzhihui@xfusion.com> - 20.10.23-3
 - DESC: sync upstream patch
         Dockerfile: configure code dir as "safe" directory

patch/README.md

@@ -0,0 +1 @@
+This directory is used to apply patches for the project

patch/backport-0001-20.10-update-containerd-binary-to-v1.6.16.patch

@@ -1,35 +0,0 @@
-From 526ae907e2828307f54315b184457c64bf1b299d Mon Sep 17 00:00:00 2001
-From: Sebastiaan van Stijn <github@gone.nl>
-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 <github@gone.nl>
----
- 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
-

patch/backport-0001-Dockerfile-configure-code-dir-as-safe-directory.patch

@@ -1,36 +0,0 @@
-From 0312e468da5c99267654d5c6b62785e29ffe6e0d Mon Sep 17 00:00:00 2001
-From: Sebastiaan van Stijn <github@gone.nl>
-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 <github@gone.nl>
-(cherry picked from commit 21677816a01057bc7c645da8429314d44324ddea)
-Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
----
- 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
-

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