-
Notifications
You must be signed in to change notification settings - Fork 18.7k
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
Vendor SwarmKit for 1.12.2 #26765
Vendor SwarmKit for 1.12.2 #26765
Conversation
Looks like this is related to / fixes:
@aaronlehmann can you check if those are resolved by this? Also (as I see they're still open); do we need a separate PR to fix this in master? |
|
@cpuguy83 that's my fault 😞 #26707 (comment). And, apparently the DCO check does a diff compared to "master", and checks every commit since (not just the commits in the PR) |
Should we rewrite history on the 1.12.x branch? Or add a commit that disables this check? |
Let's keep this open until we confirm that the fixes here help. Already closed (is that correct? milestone is 1.12.2 and the docker PR hasn't been backported yet) Will close after this is merged.
No, #26538 just vendored swarmkit. |
Just discussed with @icecrime and that's probably the best option; I'll have a look later tonight, and will let you know when to rebase/update your PR. |
@aaronlehmann should be fixed now #26707 (comment) |
2aad38b
to
98b2ec0
Compare
Rebased. |
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
"lgtm", but ping @LK4D4 to double check if all required fixes from SwarmKit are here |
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
98b2ec0
to
33e855f
Compare
I've updated this to include two more swarmkit PRs:
|
LGTM |
1 similar comment
LGTM |
This brings in the following fixes:
@vieux