Skip to content

man: remove tools.go in favor of tools directive #7041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 2 commits into from
Jun 10, 2026
+8 −9
Merged

man: remove tools.go in favor of tools directive #7041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5501642
man: remove tools.go in favor of tools directive
thaJeztah Jun 10, 2026
1c22ca1
scripts/docs: use "go install tool"
thaJeztah Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions man/tools.go
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions scripts/docs/generate-man.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ set -eu
if ! command -v "$GO_MD2MAN" > /dev/null; then
(
set -x
go build -mod=vendor -modfile=vendor.mod -o ./build/tools/go-md2man ./vendor/github.com/cpuguy83/go-md2man/v2
# note: this installs all tools defined in go.mod/vendor.mod
GOBIN="$(pwd)/build/tools" go install -mod=vendor -modfile=vendor.mod tool
)
GO_MD2MAN=$(realpath ./build/tools/go-md2man)
GO_MD2MAN="$(pwd)/build/tools/go-md2man"
fi

mkdir -p man/man1
Expand Down
7 changes: 5 additions & 2 deletions vendor.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ module github.com/docker/cli

go 1.25.0

tool golang.org/x/mod/modfile // for module compatibility check
tool (
github.com/cpuguy83/go-md2man/v2 // for scripts/docs/generate-man.sh
golang.org/x/mod/modfile // for module compatibility check
)

require (
dario.cat/mergo v1.0.2
github.com/containerd/errdefs v1.0.0
github.com/containerd/log v0.1.0
github.com/containerd/platforms v1.0.0-rc.4
github.com/cpuguy83/go-md2man/v2 v2.0.7
github.com/creack/pty v1.1.24
github.com/distribution/reference v0.6.0
github.com/docker/cli-docs-tool v0.11.0
Expand Down Expand Up @@ -74,6 +76,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
github.com/docker/go-events v0.0.0-20250808211157-605354379745 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
Expand Down