Skip to content

Conversation

@thaJeztah
Copy link
Member

Update to containerd v1.5.4 to address CVE-2021-32760.

- Description for the changelog

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

@thaJeztah thaJeztah force-pushed the update_containerd_binary_1.5.4 branch from 33afdda to d1a2ce7 Compare July 19, 2021 19:22
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

@thaJeztah
Copy link
Member Author

@tonistiigi @cpuguy83 ptal

vendor.conf Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Comment is incorrect.

Copy link
Member Author

Choose a reason for hiding this comment

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

Whoops. thx; fixed!

@thaJeztah thaJeztah force-pushed the update_containerd_binary_1.5.4 branch from d1a2ce7 to 4fc2d4d Compare July 20, 2021 06:57
@thaJeztah
Copy link
Member Author

One failure on arm64 (known flaky: #42582)

=== RUN   TestCreateParallel
time="2021-07-20T07:10:40Z" level=warning msg="bridge store not initialized. kv object docker/network/v1.0/bridge/net99/ is not added to the store"
time="2021-07-20T07:10:40Z" level=warning msg="bridge store not initialized. kv object docker/network/v1.0/bridge/net75/ is not added to the store"
    bridge_test.go:1133: Success should be 1 instead: 2
--- FAIL: TestCreateParallel (0.37s)

re-kicked CI

@AkihiroSuda AkihiroSuda merged commit 471fd27 into moby:master Jul 20, 2021
@thaJeztah thaJeztah deleted the update_containerd_binary_1.5.4 branch July 20, 2021 11:13
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