From eebad5ad47cf0a3ac37ccfce076f2f8175b6aa4d Mon Sep 17 00:00:00 2001 From: dayshappy Date: Tue, 4 Apr 2023 09:58:34 +0800 Subject: [PATCH] [Backport]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 reference:https://github.com/moby/moby/pull/44946/commits Signed-off-by: dayshappy --- moby.spec | 6 +++- ...configure-code-dir-as-safe-directory.patch | 36 +++++++++++++++++++ series.conf | 1 + 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 patch/backport-0001-Dockerfile-configure-code-dir-as-safe-directory.patch diff --git a/moby.spec b/moby.spec index 14e7060..097004b 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: docker Version: 20.10.23 -Release: 2 +Release: 3 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com @@ -210,6 +210,10 @@ fi %systemd_postun_with_restart docker.service %changelog +* Tue Apr 4 2023 zhangzhihui - 20.10.23-3 +- DESC: sync upstream patch + Dockerfile: configure code dir as "safe" directory + * Fri Mar 31 2023 zhangzhihui - 20.10.23-2 - DESC: sync upstream patch to update containerd to v1.6.16 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 new file mode 100644 index 0000000..f300476 --- /dev/null +++ b/patch/backport-0001-Dockerfile-configure-code-dir-as-safe-directory.patch @@ -0,0 +1,36 @@ +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 a655a9b..f2513f9 100644 --- a/series.conf +++ b/series.conf @@ -1 +1,2 @@ patch/backport-0001-20.10-update-containerd-binary-to-v1.6.16.patch +patch/backport-0001-Dockerfile-configure-code-dir-as-safe-directory.patch -- Gitee