Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Apr 2, 2021

full diff: containerd/containerd@19ee068...v1.5.2
I'll be looking if other dependencies need to be updated for containerd, but these were the minimal changes

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah thaJeztah added this to the 21.xx milestone Apr 2, 2021
@thaJeztah thaJeztah force-pushed the bump_containerd branch 2 times, most recently from 748e03b to 6f0c076 Compare April 22, 2021 22:26
@thaJeztah thaJeztah changed the title vendor: github.com/containerd/containerd v1.5.0-beta.4-105-g261c107ff vendor: github.com/containerd/containerd v1.5.0-rc.2, runc v1.0.0-rc93 Apr 22, 2021
@AkihiroSuda
Copy link
Member

What's current status?

@thaJeztah thaJeztah changed the title vendor: github.com/containerd/containerd v1.5.0-rc.2, runc v1.0.0-rc93 vendor: github.com/containerd/containerd v1.5.2 Jun 4, 2021
@thaJeztah
Copy link
Member Author

Arf that ebpf rename of readme.md -> README.md keeps following me 😞

[2021-06-04T12:19:15.787Z] The result of vndr differs
[2021-06-04T12:19:15.787Z] 
[2021-06-04T12:19:15.787Z]  D vendor/github.com/cilium/ebpf/readme.md
[2021-06-04T12:19:15.787Z] 
[2021-06-04T12:19:15.787Z] Please vendor your package with github.com/LK4D4/vndr.

@thaJeztah thaJeztah marked this pull request as ready for review June 4, 2021 15:43
@thaJeztah thaJeztah requested a review from cpuguy83 as a code owner June 4, 2021 15:43
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83 cpuguy83 merged commit e27beeb into moby:master Jun 4, 2021
@thaJeztah thaJeztah deleted the bump_containerd branch June 4, 2021 23:32
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants