Skip to content

Conversation

@thaJeztah
Copy link
Member

Description

Related issues or tickets

Reviews

  • Technical review
  • Editorial review
  • Product review

@netlify
Copy link

netlify bot commented Jan 27, 2026

Deploy Preview for docsdocker ready!

Name Link
🔨 Latest commit cb88496
🔍 Latest deploy log https://app.netlify.com/projects/docsdocker/deploys/6978bb93c3d5ae0008733d6b
😎 Deploy Preview https://deploy-preview-24025--docsdocker.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@github-actions github-actions bot added the dependencies Vendoring, packaging updates label Jan 27, 2026
@thaJeztah
Copy link
Member Author

Not sure if it's expected for go mod tidy to work; probably these are because the top-level doesn't have a .go file 🤔

go: finding module for package github.com/docker/buildx
go: finding module for package github.com/docker/compose/v5
go: finding module for package github.com/docker/scout-cli
go: github.com/docker/mcp-gateway: module github.com/docker/mcp-gateway@latest found (v0.37.0), but does not contain package github.com/docker/mcp-gateway
go: github.com/docker/buildx: module github.com/docker/buildx@latest found (v0.31.0), but does not contain package github.com/docker/buildx
go: github.com/docker/cli: module github.com/docker/cli@latest found (v29.2.0+incompatible), but does not contain package github.com/docker/cli
go: github.com/docker/compose/v5: module github.com/docker/compose/v5@latest found (v5.0.2), but does not contain package github.com/docker/compose/v5
go: github.com/docker/scout-cli: module github.com/docker/scout-cli@latest found (v1.19.0), but does not contain package github.com/docker/scout-cli
go: github.com/docker/docker: module github.com/docker/docker@latest found (v28.5.2+incompatible), but does not contain package github.com/docker/docker

FWIW; trying to run go mod tidy on main will remove all dependencies (as there's no tools.go or otherwise), so I don't think that has to be an issue?

@crazy-max
Copy link
Member

I think it needs changes in module update because there is no more replace directive:

go mod edit -replace "${MODULE/@*/}=${RESOLVED}";

@thaJeztah
Copy link
Member Author

Good call; looks like we can drop that altogether;

This seems to work;

VENDOR_MODULE=github.com/docker/cli docker bake vendor
git diff go.mod
diff --git a/go.mod b/go.mod
index b2f1821168..ffbb0681a7 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ tool (

 require (
        github.com/docker/buildx v0.31.0
-       github.com/docker/cli v29.1.5+incompatible
+       github.com/docker/cli v29.2.0+incompatible
        github.com/docker/compose/v5 v5.0.1
        github.com/docker/docker v28.5.2+incompatible

Also works with a version;

VENDOR_MODULE=github.com/docker/[email protected]+incompatible docker bake vendor

git diff go.mod
diff --git a/go.mod b/go.mod
index b2f1821168..d182fc05c3 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ tool (

 require (
        github.com/docker/buildx v0.31.0
-       github.com/docker/cli v29.1.5+incompatible
+       github.com/docker/cli v29.2.0-rc.1+incompatible
        github.com/docker/compose/v5 v5.0.1
        github.com/docker/docker v28.5.2+incompatible

@thaJeztah thaJeztah marked this pull request as ready for review January 27, 2026 12:27
@thaJeztah thaJeztah requested review from crazy-max and dvdksn January 27, 2026 12:29
Copy link
Contributor

@dvdksn dvdksn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

go.mod Outdated
github.com/docker/buildx v0.31.0
github.com/docker/cli v29.1.5+incompatible
github.com/docker/compose/v5 v5.0.1
github.com/docker/docker v28.5.2+incompatible
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 need to check where we use this one for (should be fine for a follow-up though)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might be due to compose
https://github.com/docker/compose/blob/main/go.mod#L20

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, right; but if we don't have a direct import ... maybe we don't need to specify it here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I think you're right

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iirc we needed this one for contrib docs on moby repo but maybe I'm wrong

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we only pull the api docs from moby now, and that's a separate module; moby/moby/api

// reposities. The "tool" section lists the upstream repositories from which we
// vendor documentation. Use the "require" section to specify the version of the
// upstream repository.
tool (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: tool block is usually put after require and replace ones

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yeah, I was on the fence what would be more clear; I can swap them

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swapped them 👍

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah changed the title go.mod: use tools directive and no replace go.mod: use tool directive and no replace Jan 27, 2026
@dvdksn
Copy link
Contributor

dvdksn commented Jan 27, 2026

Bringing this one in so I can rebase #23782

@dvdksn dvdksn merged commit a1f6f9c into docker:main Jan 27, 2026
15 checks passed
@thaJeztah thaJeztah deleted the fix_vendoring branch January 27, 2026 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/config dependencies Vendoring, packaging updates

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants