-
Notifications
You must be signed in to change notification settings - Fork 8.2k
go.mod: use tool directive and no replace
#24025
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.
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
Conversation
✅ Deploy Preview for docsdocker ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
|
Not sure if it's expected for FWIW; trying to run |
|
I think it needs changes in module update because there is no more replace directive: Line 97 in 92082c4
|
9c91c0b to
fd40bb6
Compare
|
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+incompatibleAlso 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 |
dvdksn
left a comment
There was a problem hiding this 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 |
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
fd40bb6 to
a314b4d
Compare
| // 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 ( |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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]>
a314b4d to
cb88496
Compare
tool directive and no replace
|
Bringing this one in so I can rebase #23782 |
Description
Related issues or tickets
Reviews