diff -pruN 0.8.0-2/.github/workflows/test.yml 0.10.0-1/.github/workflows/test.yml --- 0.8.0-2/.github/workflows/test.yml 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/.github/workflows/test.yml 2025-05-19 13:44:28.000000000 +0000 @@ -10,34 +10,49 @@ on: pull_request: jobs: - validate: + prepare-validate: runs-on: ubuntu-latest + outputs: + targets: ${{ steps.generate.outputs.targets }} steps: - name: Checkout uses: actions/checkout@v4 - - name: Run - uses: docker/bake-action@v5 + name: List targets + id: generate + uses: docker/bake-action/subaction/list-targets@v6 with: - targets: validate + target: validate - test: + validate: runs-on: ubuntu-latest + needs: + - prepare-validate + strategy: + fail-fast: false + matrix: + target: ${{ fromJson(needs.prepare-validate.outputs.targets) }} steps: - - name: Checkout - uses: actions/checkout@v4 + name: Validate + uses: docker/bake-action@v6 + with: + targets: ${{ matrix.target }} + + test: + runs-on: ubuntu-latest + steps: - - name: Run - uses: docker/bake-action@v5 + name: Test + uses: docker/bake-action@v6 with: targets: test - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: - file: ./coverage.txt + files: ./coverage.txt token: ${{ secrets.CODECOV_TOKEN }} example: @@ -50,7 +65,7 @@ jobs: name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.24" - name: Download modules run: | diff -pruN 0.8.0-2/.golangci.yml 0.10.0-1/.golangci.yml --- 0.8.0-2/.golangci.yml 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/.golangci.yml 2025-05-19 13:44:28.000000000 +0000 @@ -1,37 +1,38 @@ -run: - timeout: 10m +version: "2" linters: + default: none enable: - - deadcode - depguard - - gofmt - - goimports - revive - govet - importas - ineffassign - misspell - - typecheck - - varcheck - errname - makezero - whitespace - disable-all: true + settings: + depguard: + rules: + main: + deny: + - pkg: io/ioutil + desc: The io/ioutil package has been deprecated, see https://go.dev/doc/go1.16#ioutil + importas: + no-unaliased: true + exclusions: + generated: lax + rules: + - linters: + - revive + text: stutters -linters-settings: - depguard: - list-type: blacklist - include-go-root: true - packages: - # The io/ioutil package has been deprecated. - # https://go.dev/doc/go1.16#ioutil - - io/ioutil - importas: - no-unaliased: true +formatters: + enable: + - gofmt + - goimports issues: - exclude-rules: - - linters: - - revive - text: "stutters" + max-issues-per-linter: 0 + max-same-issues: 0 diff -pruN 0.8.0-2/Dockerfile 0.10.0-1/Dockerfile --- 0.8.0-2/Dockerfile 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/Dockerfile 2025-05-19 13:44:28.000000000 +0000 @@ -14,20 +14,37 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG GO_VERSION="1.18" -ARG GOLANGCI_LINT_VERSION="v1.45" -ARG ADDLICENSE_VERSION="v1.0.0" +ARG GO_VERSION="1.24" +ARG XX_VERSION="1.6.1" +ARG GOLANGCI_LINT_VERSION="v2.1.5" +ARG ADDLICENSE_VERSION="v1.1.1" ARG LICENSE_ARGS="-c cli-docs-tool -l apache" ARG LICENSE_FILES=".*\(Dockerfile\|\.go\|\.hcl\|\.sh\)" FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint -FROM ghcr.io/google/addlicense:${ADDLICENSE_VERSION} AS addlicense +FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx -FROM golang:${GO_VERSION}-alpine AS base +FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS base RUN apk add --no-cache cpio findutils git linux-headers ENV CGO_ENABLED=0 WORKDIR /src +COPY --link --from=xx / / + +FROM base AS addlicense +ARG ADDLICENSE_VERSION +ARG TARGETPLATFORM +RUN --mount=target=/root/.cache,type=cache \ + --mount=type=cache,target=/go/pkg/mod <&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor"' - echo "$diff" - exit 1 -fi + set -e + git add -A + cp -rf /out/* . + diff=$(git status --porcelain -- go.mod go.sum) + if [ -n "$diff" ]; then + echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor"' + echo "$diff" + exit 1 + fi EOT FROM base AS lint @@ -61,7 +78,7 @@ FROM base AS license-set ARG LICENSE_ARGS ARG LICENSE_FILES RUN --mount=type=bind,target=.,rw \ - --mount=from=addlicense,source=/app/addlicense,target=/usr/bin/addlicense \ + --mount=from=addlicense,source=/out/addlicense,target=/usr/bin/addlicense \ find . -regex "${LICENSE_FILES}" | xargs addlicense ${LICENSE_ARGS} \ && mkdir /out \ && find . -regex "${LICENSE_FILES}" | cpio -pdm /out @@ -73,7 +90,7 @@ FROM base AS license-validate ARG LICENSE_ARGS ARG LICENSE_FILES RUN --mount=type=bind,target=. \ - --mount=from=addlicense,source=/app/addlicense,target=/usr/bin/addlicense \ + --mount=from=addlicense,source=/out/addlicense,target=/usr/bin/addlicense \ find . -regex "${LICENSE_FILES}" | xargs addlicense -check ${LICENSE_ARGS} FROM vendored AS test diff -pruN 0.8.0-2/annotation/annotation.go 0.10.0-1/annotation/annotation.go --- 0.8.0-2/annotation/annotation.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/annotation/annotation.go 2025-05-19 13:44:28.000000000 +0000 @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package annotation handles annotations for CLI commands. package annotation const ( diff -pruN 0.8.0-2/clidocstool.go 0.10.0-1/clidocstool.go --- 0.8.0-2/clidocstool.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/clidocstool.go 2025-05-19 13:44:28.000000000 +0000 @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package clidocstool provides tools for generating CLI documentation. package clidocstool import ( @@ -65,7 +66,7 @@ func New(opts Options) (*Client, error) } else { c.target = opts.TargetDir } - if err := os.MkdirAll(c.target, 0755); err != nil { + if err := os.MkdirAll(c.target, 0o755); err != nil { return nil, err } return c, nil diff -pruN 0.8.0-2/clidocstool_man.go 0.10.0-1/clidocstool_man.go --- 0.8.0-2/clidocstool_man.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/clidocstool_man.go 2025-05-19 13:44:28.000000000 +0000 @@ -64,6 +64,14 @@ func (c *Client) genManTreeCustom(cmd *c return nil } + // Skip hidden command recursively + for curr := cmd; curr != nil; curr = curr.Parent() { + if curr.Hidden { + log.Printf("INFO: Skipping Man for %q (hidden command)", curr.CommandPath()) + return nil + } + } + log.Printf("INFO: Generating Man for %q", cmd.CommandPath()) return doc.GenManTreeFromOpts(cmd, doc.GenManTreeOptions{ diff -pruN 0.8.0-2/clidocstool_man_test.go 0.10.0-1/clidocstool_man_test.go --- 0.8.0-2/clidocstool_man_test.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/clidocstool_man_test.go 2025-05-19 13:44:28.000000000 +0000 @@ -57,7 +57,7 @@ func TestGenManTree(t *testing.T) { seen := make(map[string]struct{}) remanpage := regexp.MustCompile(`\.\d+$`) - filepath.Walk("fixtures", func(path string, info fs.FileInfo, err error) error { + _ = filepath.Walk("fixtures", func(path string, info fs.FileInfo, _ error) error { fname := filepath.Base(path) // ignore dirs and any file that is not a manpage if info.IsDir() || !remanpage.MatchString(fname) { @@ -77,7 +77,7 @@ func TestGenManTree(t *testing.T) { return nil }) - filepath.Walk(tmpdir, func(path string, info fs.FileInfo, err error) error { + _ = filepath.Walk(tmpdir, func(path string, info fs.FileInfo, _ error) error { fname := filepath.Base(path) // ignore dirs and any file that is not a manpage if info.IsDir() || !remanpage.MatchString(fname) { diff -pruN 0.8.0-2/clidocstool_md.go 0.10.0-1/clidocstool_md.go --- 0.8.0-2/clidocstool_md.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/clidocstool_md.go 2025-05-19 13:44:28.000000000 +0000 @@ -53,10 +53,12 @@ func (c *Client) GenMarkdownTree(cmd *co return nil } - // Skip hidden command - if cmd.Hidden { - log.Printf("INFO: Skipping Markdown for %q (hidden command)", cmd.CommandPath()) - return nil + // Skip hidden command recursively + for curr := cmd; curr != nil; curr = curr.Parent() { + if curr.Hidden { + log.Printf("INFO: Skipping Markdown for %q (hidden command)", curr.CommandPath()) + return nil + } } log.Printf("INFO: Generating Markdown for %q", cmd.CommandPath()) @@ -94,7 +96,7 @@ func (c *Client) GenMarkdownTree(cmd *co }); err != nil { return err } - if err = os.WriteFile(targetPath, icBuf.Bytes(), 0644); err != nil { + if err = os.WriteFile(targetPath, icBuf.Bytes(), 0o644); err != nil { return err } } else if err := copyFile(sourcePath, targetPath); err != nil { diff -pruN 0.8.0-2/clidocstool_md_test.go 0.10.0-1/clidocstool_md_test.go --- 0.8.0-2/clidocstool_md_test.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/clidocstool_md_test.go 2025-05-19 13:44:28.000000000 +0000 @@ -42,7 +42,7 @@ func TestGenMarkdownTree(t *testing.T) { seen := make(map[string]struct{}) - filepath.Walk("fixtures", func(path string, info fs.FileInfo, err error) error { + _ = filepath.Walk("fixtures", func(path string, info fs.FileInfo, _ error) error { fname := filepath.Base(path) // ignore dirs, .pre.md files and any file that is not a .md file if info.IsDir() || !strings.HasSuffix(fname, ".md") || strings.HasSuffix(fname, ".pre.md") { @@ -62,7 +62,7 @@ func TestGenMarkdownTree(t *testing.T) { return nil }) - filepath.Walk(tmpdir, func(path string, info fs.FileInfo, err error) error { + _ = filepath.Walk(tmpdir, func(path string, info fs.FileInfo, _ error) error { fname := filepath.Base(path) // ignore dirs, .pre.md files and any file that is not a .md file if info.IsDir() || !strings.HasSuffix(fname, ".md") || strings.HasSuffix(fname, ".pre.md") { diff -pruN 0.8.0-2/clidocstool_test.go 0.10.0-1/clidocstool_test.go --- 0.8.0-2/clidocstool_test.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/clidocstool_test.go 2025-05-19 13:44:28.000000000 +0000 @@ -32,13 +32,15 @@ import ( ) var ( - dockerCmd *cobra.Command - attachCmd *cobra.Command - buildxCmd *cobra.Command - buildxBuildCmd *cobra.Command - buildxDialStdioCmd *cobra.Command - buildxInstallCmd *cobra.Command - buildxStopCmd *cobra.Command + dockerCmd *cobra.Command + attachCmd *cobra.Command + buildxCmd *cobra.Command + buildxBuildCmd *cobra.Command + buildxDialStdioCmd *cobra.Command + buildxImagetoolsCmd *cobra.Command + buildxImagetoolsCreateCmd *cobra.Command + buildxInstallCmd *cobra.Command + buildxStopCmd *cobra.Command ) //nolint:errcheck @@ -49,7 +51,7 @@ func setup() { SilenceUsage: true, SilenceErrors: true, TraverseChildren: true, - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(*cobra.Command, []string) {}, Version: "20.10.8", DisableFlagsInUseLine: true, } @@ -65,7 +67,7 @@ func setup() { Annotations: map[string]string{ "aliases": "docker container attach, docker attach", }, - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(*cobra.Command, []string) {}, } attachFlags := attachCmd.Flags() @@ -86,7 +88,7 @@ func setup() { Use: "build [OPTIONS] PATH | URL | -", Aliases: []string{"b"}, Short: "Start a build", - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(*cobra.Command, []string) {}, Annotations: map[string]string{ "aliases": "docker image build, docker buildx build, docker buildx b, docker build", }, @@ -95,19 +97,30 @@ func setup() { Use: "dial-stdio", Short: "Proxy current stdio streams to builder instance", Args: cobra.NoArgs, - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(*cobra.Command, []string) {}, + } + buildxImagetoolsCmd = &cobra.Command{ + Use: "imagetools", + Short: "Commands to work on images in registry", + Run: func(*cobra.Command, []string) {}, + Hidden: true, + } + buildxImagetoolsCreateCmd = &cobra.Command{ + Use: "create [OPTIONS] [SOURCE...]", + Short: "Create a new image based on source images", + Run: func(*cobra.Command, []string) {}, } buildxInstallCmd = &cobra.Command{ Use: "install", Short: "Install buildx as a 'docker builder' alias", Args: cobra.ExactArgs(0), - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(*cobra.Command, []string) {}, Hidden: true, } buildxStopCmd = &cobra.Command{ Use: "stop [NAME]", Short: "Stop builder instance", - Run: func(cmd *cobra.Command, args []string) {}, + Run: func(*cobra.Command, []string) {}, } buildxPFlags := buildxCmd.PersistentFlags() @@ -223,6 +236,8 @@ format: "default|[=|[,< buildxCmd.AddCommand(buildxBuildCmd) buildxCmd.AddCommand(buildxDialStdioCmd) + buildxImagetoolsCmd.AddCommand(buildxImagetoolsCreateCmd) + buildxCmd.AddCommand(buildxImagetoolsCmd) buildxCmd.AddCommand(buildxInstallCmd) buildxCmd.AddCommand(buildxStopCmd) dockerCmd.AddCommand(buildxCmd) @@ -233,6 +248,11 @@ func TestGenAllTree(t *testing.T) { setup() tmpdir := t.TempDir() + // keep for testing + //tmpdir, err := os.MkdirTemp("", "cli-docs-tools") + //require.NoError(t, err) + //t.Log(tmpdir) + epoch, err := time.Parse("2006-Jan-02", "2020-Jan-10") require.NoError(t, err) t.Setenv("SOURCE_DATE_EPOCH", strconv.FormatInt(epoch.Unix(), 10)) @@ -255,7 +275,7 @@ func TestGenAllTree(t *testing.T) { seen := make(map[string]struct{}) - filepath.Walk("fixtures", func(path string, info fs.FileInfo, err error) error { + _ = filepath.Walk("fixtures", func(path string, info fs.FileInfo, err error) error { fname := filepath.Base(path) // ignore dirs and .pre.md files if info.IsDir() || strings.HasSuffix(fname, ".pre.md") { @@ -275,7 +295,7 @@ func TestGenAllTree(t *testing.T) { return nil }) - filepath.Walk(tmpdir, func(path string, info fs.FileInfo, err error) error { + _ = filepath.Walk(tmpdir, func(path string, info fs.FileInfo, _ error) error { fname := filepath.Base(path) // ignore dirs and .pre.md files if info.IsDir() || strings.HasSuffix(fname, ".pre.md") { diff -pruN 0.8.0-2/clidocstool_yaml.go 0.10.0-1/clidocstool_yaml.go --- 0.8.0-2/clidocstool_yaml.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/clidocstool_yaml.go 2025-05-19 13:44:28.000000000 +0000 @@ -77,7 +77,7 @@ type cmdDoc struct { // subcmds, `sub` and `sub-third`, and `sub` has a subcommand called `third` // it is undefined which help output will be in the file `cmd-sub-third.1`. func (c *Client) GenYamlTree(cmd *cobra.Command) error { - emptyStr := func(s string) string { return "" } + emptyStr := func(string) string { return "" } if err := c.loadLongDescription(cmd, "yaml"); err != nil { return err } @@ -169,6 +169,9 @@ func (c *Client) genYamlCustom(cmd *cobr // check recursively to handle inherited annotations for curr := cmd; curr != nil; curr = curr.Parent() { + if curr.Hidden { + cliDoc.Hidden = true + } if v, ok := curr.Annotations["version"]; ok && cliDoc.MinAPIVersion == "" { cliDoc.MinAPIVersion = v } @@ -349,9 +352,9 @@ func genFlagResult(cmd *cobra.Command, f // // This makes the generated YAML more readable, and easier to review changes. // max can be used to customize the width to keep the whole line < 80 chars. -func forceMultiLine(s string, max int) string { +func forceMultiLine(s string, maxWidth int) string { s = strings.TrimSpace(s) - if len(s) > max && !strings.Contains(s, "\n") { + if len(s) > maxWidth && !strings.Contains(s, "\n") { s = s + "\n" } return s diff -pruN 0.8.0-2/clidocstool_yaml_test.go 0.10.0-1/clidocstool_yaml_test.go --- 0.8.0-2/clidocstool_yaml_test.go 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/clidocstool_yaml_test.go 2025-05-19 13:44:28.000000000 +0000 @@ -40,7 +40,7 @@ func TestGenYamlTree(t *testing.T) { seen := make(map[string]struct{}) - filepath.Walk("fixtures", func(path string, info fs.FileInfo, err error) error { + _ = filepath.Walk("fixtures", func(path string, info fs.FileInfo, _ error) error { fname := filepath.Base(path) // ignore dirs and any file that is not a .yaml file if info.IsDir() || !strings.HasSuffix(fname, ".yaml") { @@ -60,7 +60,7 @@ func TestGenYamlTree(t *testing.T) { return nil }) - filepath.Walk(tmpdir, func(path string, info fs.FileInfo, err error) error { + _ = filepath.Walk(tmpdir, func(path string, info fs.FileInfo, _ error) error { fname := filepath.Base(path) // ignore dirs and any file that is not a .yaml file if info.IsDir() || !strings.HasSuffix(fname, ".yaml") { diff -pruN 0.8.0-2/debian/changelog 0.10.0-1/debian/changelog --- 0.8.0-2/debian/changelog 2025-02-24 20:44:48.000000000 +0000 +++ 0.10.0-1/debian/changelog 2025-09-30 10:27:21.000000000 +0000 @@ -1,3 +1,15 @@ +golang-github-docker-cli-docs-tool (0.10.0-1) unstable; urgency=medium + + * New upstream release + * Works with newer go-md2man + * gitlab-ci.yml: Use salsa-ci + * Bump Standards-Version, no changes needed + * debian/watch: update to version 5 + * Remove redundant Rules-Requires-Root field + * Add myself to maintainers + + -- Reinhard Tartler Tue, 30 Sep 2025 06:27:21 -0400 + golang-github-docker-cli-docs-tool (0.8.0-2) unstable; urgency=medium * No change source-only upload for testing migration. diff -pruN 0.8.0-2/debian/control 0.10.0-1/debian/control --- 0.8.0-2/debian/control 2025-02-24 20:44:48.000000000 +0000 +++ 0.10.0-1/debian/control 2025-09-30 10:27:21.000000000 +0000 @@ -2,8 +2,8 @@ Source: golang-github-docker-cli-docs-to Section: golang Priority: optional Maintainer: Debian Go Packaging Team -Uploaders: Nicolas Peugnet -Rules-Requires-Root: no +Uploaders: Nicolas Peugnet , + Reinhard Tartler Build-Depends: debhelper-compat (= 13), dh-sequence-golang, golang-any, @@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 13), golang-github-stretchr-testify-dev, golang-gopkg-yaml.v3-dev Testsuite: autopkgtest-pkg-go -Standards-Version: 4.7.0 +Standards-Version: 4.7.2 Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-github-docker-cli-docs-tool Vcs-Git: https://salsa.debian.org/go-team/packages/golang-github-docker-cli-docs-tool.git Homepage: https://github.com/docker/cli-docs-tool diff -pruN 0.8.0-2/debian/gbp.conf 0.10.0-1/debian/gbp.conf --- 0.8.0-2/debian/gbp.conf 2025-02-24 20:44:48.000000000 +0000 +++ 0.10.0-1/debian/gbp.conf 2025-09-30 10:27:21.000000000 +0000 @@ -1,3 +1,4 @@ [DEFAULT] debian-branch = debian/sid +upstream-vcs-tag = v%(version%~%-)s dist = DEP14 diff -pruN 0.8.0-2/debian/gitlab-ci.yml 0.10.0-1/debian/gitlab-ci.yml --- 0.8.0-2/debian/gitlab-ci.yml 2025-02-24 20:44:48.000000000 +0000 +++ 0.10.0-1/debian/gitlab-ci.yml 2025-09-30 10:27:21.000000000 +0000 @@ -1,6 +1,5 @@ -# auto-generated, DO NOT MODIFY. -# The authoritative copy of this file lives at: -# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go +# cf. https://salsa.debian.org/salsa-ci-team/pipeline/ --- include: - - https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -pruN 0.8.0-2/debian/watch 0.10.0-1/debian/watch --- 0.8.0-2/debian/watch 2025-02-24 20:44:48.000000000 +0000 +++ 0.10.0-1/debian/watch 2025-09-30 10:27:21.000000000 +0000 @@ -1,4 +1,4 @@ -version=4 -opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,\ - uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/$1~$2$3/" \ - https://github.com/docker/cli-docs-tool/tags .*/v?(\d\S*)\.tar\.gz debian +Version: 5 +Template: Github +Owner: docker +Project: cli-docs-tool diff -pruN 0.8.0-2/docker-bake.hcl 0.10.0-1/docker-bake.hcl --- 0.8.0-2/docker-bake.hcl 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/docker-bake.hcl 2025-05-19 13:44:28.000000000 +0000 @@ -12,6 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +target "_common" { + args = { + BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1 + } +} + group "default" { targets = ["test"] } @@ -21,31 +27,37 @@ group "validate" { } target "lint" { + inherits = ["_common"] target = "lint" output = ["type=cacheonly"] } target "vendor-validate" { + inherits = ["_common"] target = "vendor-validate" output = ["type=cacheonly"] } target "vendor-update" { + inherits = ["_common"] target = "vendor-update" output = ["."] } target "test" { + inherits = ["_common"] target = "test-coverage" output = ["."] } target "license-validate" { + inherits = ["_common"] target = "license-validate" output = ["type=cacheonly"] } target "license-update" { + inherits = ["_common"] target = "license-update" output = ["."] } diff -pruN 0.8.0-2/example/go.mod 0.10.0-1/example/go.mod --- 0.8.0-2/example/go.mod 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/example/go.mod 2025-05-19 13:44:28.000000000 +0000 @@ -1,12 +1,12 @@ module github.com/docker/cli-docs-tool/example -go 1.20 +go 1.23.0 require ( github.com/docker/buildx v0.11.2 github.com/docker/cli v24.0.2+incompatible github.com/docker/cli-docs-tool v0.7.0 - github.com/spf13/cobra v1.7.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 ) @@ -41,7 +41,7 @@ require ( github.com/containerd/continuity v0.4.1 // indirect github.com/containerd/ttrpc v1.2.2 // indirect github.com/containerd/typeurl/v2 v2.1.1 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/distribution/distribution/v3 v3.0.0-20230214150026-36d8c594d7aa // indirect @@ -120,7 +120,7 @@ require ( github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/stretchr/testify v1.8.4 // indirect + github.com/stretchr/testify v1.9.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/theupdateframework/notary v0.6.1 // indirect github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect diff -pruN 0.8.0-2/example/go.sum 0.10.0-1/example/go.sum --- 0.8.0-2/example/go.sum 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/example/go.sum 2025-05-19 13:44:28.000000000 +0000 @@ -21,7 +21,9 @@ cloud.google.com/go/bigquery v1.5.0/go.m cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -37,6 +39,7 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-2019 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652 h1:+vTEFqeoeur6XSq06bs+roX3YiT49gUniJK7Zky7Xjg= +github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652/go.mod h1:OahwfttHWG6eJ0clwcfBAHoDI6X/LV/15hx/wlMZSrU= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -46,8 +49,10 @@ github.com/Masterminds/semver/v3 v3.2.1/ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.10.0-rc.8 h1:YSZVvlIIDD1UxQpJp0h+dnpLUw+TrY0cx8obKsp3bek= +github.com/Microsoft/hcsshim v0.10.0-rc.8/go.mod h1:OEthFdQv/AD2RAdzR6Mm1N1KPCztGKDurW1Z8b8VGMM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= @@ -56,6 +61,7 @@ github.com/agl/ed25519 v0.0.0-2017011620 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 h1:aM1rlcoLz8y5B2r4tTLMiVTrMtpfY0O8EScKJxaSaEc= +github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U= github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= @@ -66,6 +72,7 @@ github.com/apparentlymart/go-textseg/v12 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aws/aws-sdk-go-v2 v1.17.6 h1:Y773UK7OBqhzi5VDXMi1zVGsoj+CVHs2eaC2bDsLwi0= github.com/aws/aws-sdk-go-v2 v1.17.6/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/config v1.18.16 h1:4r7gsCu8Ekwl5iJGE/GmspA2UifqySCCkyyyPFeWs3w= @@ -96,8 +103,11 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKn github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bugsnag/bugsnag-go v1.4.1 h1:TT3P9AX69w8mbSGE8L7IJOO2KBlPN0iQtYD0dUlrWHc= +github.com/bugsnag/bugsnag-go v1.4.1/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA= +github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY= +github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -110,6 +120,7 @@ github.com/chzyer/readline v0.0.0-201806 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cfssl v0.0.0-20181213083726-b94e044bb51e h1:Qux+lbuMaRzkQyTdzgtz8MgzPtzmaPQy6DXmxpdxT3U= +github.com/cloudflare/cfssl v0.0.0-20181213083726-b94e044bb51e/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= @@ -118,10 +129,13 @@ github.com/cncf/xds/go v0.0.0-2021080503 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE= +github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= github.com/compose-spec/compose-go v1.14.0 h1:/+tQxBEPIrfsi87Qh7/VjMzcJN3BRNER/RO71ku+u6E= github.com/compose-spec/compose-go v1.14.0/go.mod h1:m0o4G6MQDHjjz9rY7No9FpnNi+9sKic262rzrwuCqic= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= +github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.7.2 h1:UF2gdONnxO8I6byZXDi5sXWiWvlW3D/sci7dTQimEJo= @@ -129,17 +143,22 @@ github.com/containerd/containerd v1.7.2/ github.com/containerd/continuity v0.4.1 h1:wQnVrjIyQ8vhU2sgOiL5T07jo+ouqc2bnKsv5/EqGhU= github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= +github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= github.com/containerd/nydus-snapshotter v0.8.2 h1:7SOrMU2YmLzfbsr5J7liMZJlNi5WT6vtIOxLGv+iz7E= +github.com/containerd/nydus-snapshotter v0.8.2/go.mod h1:UJILTN5LVBRY+dt8BGJbp72Xy729hUZsOugObEI3/O8= github.com/containerd/stargz-snapshotter v0.14.3 h1:OTUVZoPSPs8mGgmQUE1dqw3WX/3nrsmsurW7UPLWl1U= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= +github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtOs= github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/typeurl/v2 v2.1.1 h1:3Q4Pt7i8nYwy2KmQWIw2+1hTvwTE/6w9FqcttATPO/4= github.com/containerd/typeurl/v2 v2.1.1/go.mod h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0= -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -162,13 +181,16 @@ github.com/docker/go v1.5.1-1.0.20160303 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20150526203908-9cbd2a1374f4 h1:k8TfKGeAcDQFFQOGCQMRN04N4a9YrPlRMMKnzAuvM9Q= +github.com/docker/libtrust v0.0.0-20150526203908-9cbd2a1374f4/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 h1:pEtiCjIXx3RvGjlUJuCNxNOw0MNblyR9Wi+vJGBFh+8= +github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ= github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -179,9 +201,11 @@ github.com/envoyproxy/go-control-plane v github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE= github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -207,12 +231,14 @@ github.com/go-openapi/swag v0.19.5/go.mo github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= +github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -221,10 +247,12 @@ github.com/gogo/protobuf v1.3.2/go.mod h github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -254,6 +282,7 @@ github.com/golang/protobuf v1.5.3/go.mod github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/certificate-transparency-go v1.1.4 h1:hCyXHDbtqlr/lMXU0D4WgbalXL0Zk4dSWWMbPV8VrqY= +github.com/google/certificate-transparency-go v1.1.4/go.mod h1:D6lvbfwckhNrbM9WVl1EVeMOyzC19mpIjMOI4nxBHtQ= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -300,6 +329,7 @@ github.com/grpc-ecosystem/grpc-gateway/v github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 h1:lLT7ZLSzGLI08vc9cpd+tYmNWjdKDqyr/2L+f6U12Fk= github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= +github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 h1:kgvybwEeu0SXktbB2y3uLHX9lklLo+nzUwh59A3jzQc= github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840/go.mod h1:Abjk0jbRkDaNCzsRhOv2iDCofYpX1eVsjozoiK63qLA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -316,7 +346,9 @@ github.com/in-toto/in-toto-golang v0.5.0 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jinzhu/gorm v1.9.2 h1:lCvgEaqe/HVE+tjAR2mt4HbbHAZsQOv3XAZiEZV37iw= +github.com/jinzhu/gorm v1.9.2/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo= github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a h1:eeaG9XMUvRBYXJi4pg1ZKM7nxc5AfXfojeLLW7O5J3k= +github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -329,6 +361,7 @@ github.com/jstemmer/go-junit-report v0.0 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= +github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= @@ -345,6 +378,7 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -393,7 +427,9 @@ github.com/munnerz/goautoneg v0.0.0-2019 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= +github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= +github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8= @@ -401,7 +437,9 @@ github.com/opencontainers/image-spec v1. github.com/opencontainers/runc v1.1.7 h1:y2EZDS8sNng4Ksf0GUYNhKbTShZJPJg1FiXJNH/uoCk= github.com/opencontainers/runc v1.1.7/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50= github.com/opencontainers/runtime-spec v1.1.0-rc.2 h1:ucBtEms2tamYYW/SvGpvq9yUN0NEVL6oyLEwDcTSrk8= +github.com/opencontainers/runtime-spec v1.1.0-rc.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU= +github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= @@ -444,6 +482,7 @@ github.com/secure-systems-lab/go-secures github.com/secure-systems-lab/go-securesystemslib v0.4.0/go.mod h1:FGBZgq2tXWICsxWQW1msNf49F0Pf2Op5Htayx335Qbs= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 h1:ka9QPuQg2u4LGipiZGsgkg3rJCo4iIUCy75FddM0GRQ= github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc= github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh5dkI= @@ -455,18 +494,20 @@ github.com/sirupsen/logrus v1.9.0 h1:trl github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spdx/tools-golang v0.5.1 h1:fJg3SVOGG+eIva9ZUBm/hvyA7PIPVFjRxUKe6fdAgwE= +github.com/spdx/tools-golang v0.5.1/go.mod h1:/DRDQuBfB37HctM29YtrX1v+bXiVmT2OpQDalRmX9aU= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= +github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -480,8 +521,9 @@ github.com/stretchr/testify v1.6.1/go.mo github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/theupdateframework/notary v0.6.1 h1:7wshjstgS9x9F5LuB1L5mBI2xNMObWqjz+cjWoom6l0= @@ -493,6 +535,7 @@ github.com/tonistiigi/units v0.0.0-20180 github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 h1:Y/M5lygoNPKwVNLMPXgVfsRT40CSFKXCxuU8LoHySjs= github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531/go.mod h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc= github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME= +github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= @@ -517,6 +560,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiO go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 h1:5jD3teb4Qh7mx/nfzq4jO2WFFpvXD0vYWFDrdvNWmXk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.40.0 h1:ZjF6qLnAVNq6xUh0sK2mCEqwnRrpgr0mLALQXJL34NI= @@ -544,6 +588,7 @@ go.opentelemetry.io/proto/otlp v0.19.0 h go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -850,10 +895,14 @@ gopkg.in/check.v1 v1.0.0-20180628173108- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/dancannon/gorethink.v3 v3.0.5 h1:/g7PWP7zUS6vSNmHSDbjCHQh1Rqn8Jy6zSMQxAsBSMQ= +gopkg.in/dancannon/gorethink.v3 v3.0.5/go.mod h1:GXsi1e3N2OcKhcP6nsYABTiUejbWMFO4GY5a4pEaeEc= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fatih/pool.v2 v2.0.0 h1:xIFeWtxifuQJGk/IEPKsTduEKcKvPmhoiVDGpC40nKg= +gopkg.in/fatih/pool.v2 v2.0.0/go.mod h1:8xVGeu1/2jr2wm5V9SPuMht2H5AEmf5aFMGSQixtjTY= gopkg.in/gorethink/gorethink.v3 v3.0.5 h1:e2Uc/Xe+hpcVQFsj6MuHlYog3r0JYpnTzwDj/y2O4MU= +gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod h1:+3yIIHJUGMBK+wyPH+iN5TP+88ikFDfZdqTlK3Y9q8I= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= @@ -869,6 +918,7 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-e gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff -pruN 0.8.0-2/fixtures/docker-attach.1 0.10.0-1/fixtures/docker-attach.1 --- 0.8.0-2/fixtures/docker-attach.1 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/fixtures/docker-attach.1 2025-05-19 13:44:28.000000000 +0000 @@ -2,22 +2,18 @@ .TH "DOCKER" "1" "Jan 2020" "Docker Community" "Docker User Manuals" .SH NAME -.PP docker-attach - Attach local standard input, output, and error streams to a running container .SH SYNOPSIS -.PP \fBdocker attach [OPTIONS] CONTAINER\fP .SH DESCRIPTION -.PP Attach local standard input, output, and error streams to a running container .SH OPTIONS -.PP \fB--detach-keys\fP="" Override the key sequence for detaching a container @@ -31,5 +27,4 @@ Attach local standard input, output, and .SH SEE ALSO -.PP \fBdocker(1)\fP diff -pruN 0.8.0-2/fixtures/docker-buildx-build.1 0.10.0-1/fixtures/docker-buildx-build.1 --- 0.8.0-2/fixtures/docker-buildx-build.1 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/fixtures/docker-buildx-build.1 2025-05-19 13:44:28.000000000 +0000 @@ -2,22 +2,18 @@ .TH "DOCKER" "1" "Jan 2020" "Docker Community" "Docker User Manuals" .SH NAME -.PP docker-buildx-build - Start a build .SH SYNOPSIS -.PP \fBdocker buildx build [OPTIONS] PATH | URL | -\fP .SH DESCRIPTION -.PP Start a build .SH OPTIONS -.PP \fB--add-host\fP=[] Add a custom host-to-IP mapping (format: 'host:ip') @@ -108,11 +104,9 @@ format: "default|[=|[,]]" .SH OPTIONS INHERITED FROM PARENT COMMANDS -.PP \fB--builder\fP="" Override the configured builder instance .SH SEE ALSO -.PP \fBdocker-buildx(1)\fP diff -pruN 0.8.0-2/fixtures/docker-buildx-dial-stdio.1 0.10.0-1/fixtures/docker-buildx-dial-stdio.1 --- 0.8.0-2/fixtures/docker-buildx-dial-stdio.1 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/fixtures/docker-buildx-dial-stdio.1 2025-05-19 13:44:28.000000000 +0000 @@ -2,22 +2,18 @@ .TH "DOCKER" "1" "Jan 2020" "Docker Community" "Docker User Manuals" .SH NAME -.PP docker-buildx-dial-stdio - Proxy current stdio streams to builder instance .SH SYNOPSIS -.PP \fBdocker buildx dial-stdio\fP .SH DESCRIPTION -.PP Proxy current stdio streams to builder instance .SH OPTIONS -.PP \fB--platform\fP="" Target platform: this is used for node selection @@ -27,11 +23,9 @@ Proxy current stdio streams to builder i .SH OPTIONS INHERITED FROM PARENT COMMANDS -.PP \fB--builder\fP="" Override the configured builder instance .SH SEE ALSO -.PP \fBdocker-buildx(1)\fP diff -pruN 0.8.0-2/fixtures/docker-buildx-install.1 0.10.0-1/fixtures/docker-buildx-install.1 --- 0.8.0-2/fixtures/docker-buildx-install.1 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/fixtures/docker-buildx-install.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -.nh -.TH "DOCKER" "1" "Jan 2020" "Docker Community" "Docker User Manuals" - -.SH NAME -.PP -docker-buildx-install - Install buildx as a 'docker builder' alias - - -.SH SYNOPSIS -.PP -\fBdocker buildx install\fP - - -.SH DESCRIPTION -.PP -Install buildx as a 'docker builder' alias - - -.SH OPTIONS INHERITED FROM PARENT COMMANDS -.PP -\fB--builder\fP="" - Override the configured builder instance - - -.SH SEE ALSO -.PP -\fBdocker-buildx(1)\fP diff -pruN 0.8.0-2/fixtures/docker-buildx-stop.1 0.10.0-1/fixtures/docker-buildx-stop.1 --- 0.8.0-2/fixtures/docker-buildx-stop.1 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/fixtures/docker-buildx-stop.1 2025-05-19 13:44:28.000000000 +0000 @@ -2,26 +2,21 @@ .TH "DOCKER" "1" "Jan 2020" "Docker Community" "Docker User Manuals" .SH NAME -.PP docker-buildx-stop - Stop builder instance .SH SYNOPSIS -.PP \fBdocker buildx stop [NAME]\fP .SH DESCRIPTION -.PP Stop builder instance .SH OPTIONS INHERITED FROM PARENT COMMANDS -.PP \fB--builder\fP="" Override the configured builder instance .SH SEE ALSO -.PP \fBdocker-buildx(1)\fP diff -pruN 0.8.0-2/fixtures/docker-buildx.1 0.10.0-1/fixtures/docker-buildx.1 --- 0.8.0-2/fixtures/docker-buildx.1 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/fixtures/docker-buildx.1 2025-05-19 13:44:28.000000000 +0000 @@ -2,26 +2,21 @@ .TH "DOCKER" "1" "Jan 2020" "Docker Community" "Docker User Manuals" .SH NAME -.PP docker-buildx - Docker Buildx .SH SYNOPSIS -.PP \fBdocker buildx\fP .SH DESCRIPTION -.PP Extended build capabilities with BuildKit .SH OPTIONS -.PP \fB--builder\fP="" Override the configured builder instance .SH SEE ALSO -.PP \fBdocker(1)\fP, \fBdocker-buildx-build(1)\fP, \fBdocker-buildx-dial-stdio(1)\fP, \fBdocker-buildx-stop(1)\fP diff -pruN 0.8.0-2/fixtures/docker.1 0.10.0-1/fixtures/docker.1 --- 0.8.0-2/fixtures/docker.1 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/fixtures/docker.1 2025-05-19 13:44:28.000000000 +0000 @@ -2,26 +2,21 @@ .TH "DOCKER" "1" "Jan 2020" "Docker Community" "Docker User Manuals" .SH NAME -.PP docker - A self-sufficient runtime for containers .SH SYNOPSIS -.PP \fBdocker [OPTIONS] COMMAND [ARG...]\fP .SH DESCRIPTION -.PP A self-sufficient runtime for containers .SH OPTIONS -.PP \fB-H\fP, \fB--host\fP="unix:///var/run/docker.sock" Daemon socket to connect to .SH SEE ALSO -.PP \fBdocker-attach(1)\fP, \fBdocker-buildx(1)\fP diff -pruN 0.8.0-2/fixtures/docker_buildx_imagetools.yaml 0.10.0-1/fixtures/docker_buildx_imagetools.yaml --- 0.8.0-2/fixtures/docker_buildx_imagetools.yaml 1970-01-01 00:00:00.000000000 +0000 +++ 0.10.0-1/fixtures/docker_buildx_imagetools.yaml 2025-05-19 13:44:28.000000000 +0000 @@ -0,0 +1,37 @@ +command: docker buildx imagetools +short: Commands to work on images in registry +long: Commands to work on images in registry +usage: docker buildx imagetools +pname: docker buildx +plink: docker_buildx.yaml +cname: + - docker buildx imagetools create +clink: + - docker_buildx_imagetools_create.yaml +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: help + value_type: bool + default_value: "false" + description: Print usage + deprecated: false + hidden: true + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: true +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff -pruN 0.8.0-2/fixtures/docker_buildx_imagetools_create.yaml 0.10.0-1/fixtures/docker_buildx_imagetools_create.yaml --- 0.8.0-2/fixtures/docker_buildx_imagetools_create.yaml 1970-01-01 00:00:00.000000000 +0000 +++ 0.10.0-1/fixtures/docker_buildx_imagetools_create.yaml 2025-05-19 13:44:28.000000000 +0000 @@ -0,0 +1,33 @@ +command: docker buildx imagetools create +short: Create a new image based on source images +long: Create a new image based on source images +usage: docker buildx imagetools create [OPTIONS] [SOURCE...] +pname: docker buildx imagetools +plink: docker_buildx_imagetools.yaml +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: help + value_type: bool + default_value: "false" + description: Print usage + deprecated: false + hidden: true + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: true +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff -pruN 0.8.0-2/go.mod 0.10.0-1/go.mod --- 0.8.0-2/go.mod 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/go.mod 2025-05-19 13:44:28.000000000 +0000 @@ -1,16 +1,16 @@ module github.com/docker/cli-docs-tool -go 1.18 +go 1.23.0 require ( - github.com/spf13/cobra v1.7.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.7.2 + github.com/stretchr/testify v1.9.0 gopkg.in/yaml.v3 v3.0.1 ) require ( - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff -pruN 0.8.0-2/go.sum 0.10.0-1/go.sum --- 0.8.0-2/go.sum 2025-02-02 15:06:12.000000000 +0000 +++ 0.10.0-1/go.sum 2025-05-19 13:44:28.000000000 +0000 @@ -1,6 +1,6 @@ -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -9,13 +9,12 @@ github.com/pmezard/go-difflib v1.0.0 h1: github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=