Skip to content
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

Update Docker to 20.10.14 #10677

Merged
merged 4 commits into from
Apr 27, 2022
Merged

Conversation

saiarcot895
Copy link
Contributor

@saiarcot895 saiarcot895 commented Apr 25, 2022

Update the Docker engine version from 20.10.7 to 20.10.14 in both the base image and the Bullseye slave container.

Why I did it

This is just to get the latest version of Docker into the image, which also includes some CVE and bug fixes.

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

Link to config_db schema for YANG module changes

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

Update the Docker engine version from 20.10.7 to 20.10.14. This brings
in some CVE and bug fixes.

Additionally, pin the version of containerd.io to a specific version,
mainly for consistency/reproducibility.

Signed-off-by: Saikrishna Arcot <[email protected]>
This appears to be already present in the current docker.service.

Signed-off-by: Saikrishna Arcot <[email protected]>
apt-key is considered deprecated, and the current practice is to just
add the key into /etc/apt/trusted.gpg.d/.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895 saiarcot895 marked this pull request as ready for review April 26, 2022 21:46
@saiarcot895 saiarcot895 requested a review from lguohan as a code owner April 26, 2022 21:46
@saiarcot895 saiarcot895 merged commit 313cced into sonic-net:master Apr 27, 2022
@saiarcot895 saiarcot895 deleted the docker-update branch April 27, 2022 17:20
liushilongbuaa pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request Jun 20, 2022
* Upgrade docker version from 20.10.7 to 20.10.14, and pin containerd.io

Update the Docker engine version from 20.10.7 to 20.10.14. This brings
in some CVE and bug fixes.

Additionally, pin the version of containerd.io to a specific version,
mainly for consistency/reproducibility.

Signed-off-by: Saikrishna Arcot <[email protected]>

* Remove the containerd ordering change to docker.service

This appears to be already present in the current docker.service.

Signed-off-by: Saikrishna Arcot <[email protected]>

* Remove use of apt-key

apt-key is considered deprecated, and the current practice is to just
add the key into /etc/apt/trusted.gpg.d/.

Signed-off-by: Saikrishna Arcot <[email protected]>

* Upgrade docker container in Bullseye slave to 20.10.14

Signed-off-by: Saikrishna Arcot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants