Update containerd/containerd to version with go modules#42274
Merged
cpuguy83 merged 4 commits intomoby:masterfrom Apr 8, 2021
Merged
Update containerd/containerd to version with go modules#42274cpuguy83 merged 4 commits intomoby:masterfrom
cpuguy83 merged 4 commits intomoby:masterfrom
Conversation
…fa21ce1c785c This is the last commit before containerd switched to using go modules. Using this as an intermediate version to allow us to more easily track what dependency updates containerd has. full diff: containerd/containerd@0edc412...b9092fa relevant changes in vendored code: - Do not hardcode "amd64" on LCOW and Windows-related files - Optimize Windows and LCOW snapshotters to only create scratch layer on the final snapshot - Add annotations to task update request api Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…3914b9beca10 This is the first commit after the containerd transition to go modules. Using this as an intermediate version to allow us to track what dependency changes are introduced in the containerd dependency since. full diff: containerd/containerd@b9092fa...fbf1a72 There were some fix-ups in the PR after adding go modules that updated dependencies, which will be aligned in the next commit. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
no local changes full diff: coreos/go-systemd@v22.0.0...v22.1.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: golang/sync@cd5d95a...6e8e738 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 task
AkihiroSuda
approved these changes
Apr 8, 2021
Member
Author
|
Windows failure is unrelated; |
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Nov 9, 2021
Possibly more dependencies need to be updated, and instead of this we should cherry-pick. This is just a quick check "what would it look like if we bumped the version in this branch"; Updating to containerd 1.5 Last containerd update in 20.10 is moby@1f88736 (moby#41688) - moby@ab1dd80 moby#42274 - moby@5761fca moby#42274 - moby@42ef2c5 moby#42276 - moby@6202322 moby#42254 - moby@7c1c123 moby#42249 - moby@84df737 moby#42636 - moby@4fc2d4d moby#42656 - moby@3d58d13 moby#42697 - moby@582ef29 moby#42994 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Nov 9, 2021
Possibly more dependencies need to be updated, and instead of this we should cherry-pick. This is just a quick check "what would it look like if we bumped the version in this branch"; Updating to containerd 1.5 Last containerd update in 20.10 is moby@1f88736 (moby#41688) - moby@ab1dd80 moby#42274 - moby@5761fca moby#42274 - moby@42ef2c5 moby#42276 - moby@6202322 moby#42254 - moby@7c1c123 moby#42249 - moby@84df737 moby#42636 - moby@4fc2d4d moby#42656 - moby@3d58d13 moby#42697 - moby@582ef29 moby#42994 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Mar 18, 2022
Possibly more dependencies need to be updated, and instead of this we should cherry-pick. This is just a quick check "what would it look like if we bumped the version in this branch"; Updating to containerd 1.5 Last containerd update in 20.10 is moby@1f88736 (moby#41688) - moby@ab1dd80 moby#42274 - moby@5761fca moby#42274 - moby@42ef2c5 moby#42276 - moby@6202322 moby#42254 - moby@7c1c123 moby#42249 - moby@84df737 moby#42636 - moby@4fc2d4d moby#42656 - moby@3d58d13 moby#42697 - moby@582ef29 moby#42994 - moby@458b4aa moby#43025 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Mar 18, 2022
Possibly more dependencies need to be updated, and instead of this we should cherry-pick. This is just a quick check "what would it look like if we bumped the version in this branch"; Updating to containerd 1.5 Last containerd update in 20.10 is moby@1f88736 (moby#41688) - moby@ab1dd80 moby#42274 - moby@5761fca moby#42274 - moby@42ef2c5 moby#42276 - moby@6202322 moby#42254 - moby@7c1c123 moby#42249 - moby@84df737 moby#42636 - moby@4fc2d4d moby#42656 - moby@3d58d13 moby#42697 - moby@582ef29 moby#42994 - moby@458b4aa moby#43025 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update containerd/containerd to version with go modules
This updates containerd to after the migration to go modules. To help the migration,
updating is done in a couple of commits to make the changes more visible / easy
to follow:
vendor: github.com/containerd/containerd b9092fae15f1814a5402bea1ceb0fa21ce1c785c
This is the last commit before containerd switched to using go modules. Using this
as an intermediate version to allow us to more easily track what dependency updates
containerd has.
full diff: containerd/containerd@0edc412...b9092fa
relevant changes in vendored code:
vendor: github.com/containerd/containerd fbf1a72de7da110187b7d3dace433914b9beca10
This is the first commit after the containerd transition to go modules. Using this
as an intermediate version to allow us to track what dependency changes are
introduced in the containerd dependency since.
full diff: containerd/containerd@b9092fa...fbf1a72
There were some fix-ups in the PR after adding go modules that updated dependencies,
which will be aligned in the next commits.
Dependencies updated:
Dependencies not updated (already ahead):
Dependencies not yet updated (doing separately)