From 9cddb4a7da9e967e8f980db9de3f867f6bb1d3b6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 20 Feb 2025 07:34:19 +0000 Subject: [PATCH 1/2] chore(deps): update dependency moby/moby to v28 --- tools/docker-manpages/manifest.yaml | 2 +- tools/docker-preview/manifest.yaml | 2 +- tools/docker-rootless/manifest.yaml | 2 +- tools/docker/manifest.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/docker-manpages/manifest.yaml b/tools/docker-manpages/manifest.yaml index 2941d08132..ab620ae9b1 100644 --- a/tools/docker-manpages/manifest.yaml +++ b/tools/docker-manpages/manifest.yaml @@ -1,6 +1,6 @@ # yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml name: docker-manpages -version: "27.5.1" +version: "28.0.0" binary: "false" check: "" # No binary build_dependencies: diff --git a/tools/docker-preview/manifest.yaml b/tools/docker-preview/manifest.yaml index d07a2d85ab..3bb27e0c23 100644 --- a/tools/docker-preview/manifest.yaml +++ b/tools/docker-preview/manifest.yaml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml $schema: https://tools.uniget.dev/schema.yaml name: docker-preview -version: "27.5.1" +version: "28.0.0" binary: ${target}/libexec/docker-preview/bin/docker check: ${binary} --version | cut -d, -f1 | cut -d' ' -f3 runtime_dependencies: diff --git a/tools/docker-rootless/manifest.yaml b/tools/docker-rootless/manifest.yaml index 0d6c041313..c9e82ff817 100644 --- a/tools/docker-rootless/manifest.yaml +++ b/tools/docker-rootless/manifest.yaml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml $schema: https://tools.uniget.dev/schema.yaml name: docker-rootless -version: "27.5.1" +version: "28.0.0" binary: "false" check: "" # No binary runtime_dependencies: diff --git a/tools/docker/manifest.yaml b/tools/docker/manifest.yaml index 97db290d96..dea33dd5b2 100644 --- a/tools/docker/manifest.yaml +++ b/tools/docker/manifest.yaml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml $schema: https://tools.uniget.dev/schema.yaml name: docker -version: "27.5.1" +version: "28.0.0" binary: dockerd check: ${binary} --version | cut -d, -f1 | cut -d' ' -f3 runtime_dependencies: From 41505c35f457bf55a7f5e0c1c611e5d8ff7f50ec Mon Sep 17 00:00:00 2001 From: Nicholas Dille Date: Thu, 20 Feb 2025 08:38:15 +0100 Subject: [PATCH 2/2] Fixed after change in manpage location --- tools/docker-manpages/Dockerfile.template | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/docker-manpages/Dockerfile.template b/tools/docker-manpages/Dockerfile.template index dfdba7779d..4369be479f 100644 --- a/tools/docker-manpages/Dockerfile.template +++ b/tools/docker-manpages/Dockerfile.template @@ -12,6 +12,7 @@ SHELL [ "bash", "-clo", "errexit" ] COPY --link --from=go / /usr/local/ COPY --link --from=make / /usr/local/ COPY --link --from=go-md2man / /usr/local/ + WORKDIR /go/src/github.com/docker/cli ARG name ARG version @@ -22,7 +23,20 @@ EOF ENV GO111MODULE=auto \ DISABLE_WARN_OUTSIDE_CONTAINER=1 \ GOPATH=/go -RUN make -j$(nproc) manpages -RUN cp -r man/man1 "${prefix}/share/man/" \ - && cp -r man/man5 "${prefix}/share/man/" \ - && cp -r man/man8 "${prefix}/share/man/" +RUN <