mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #43433 from thaJeztah/20.10_backport_update_containerd_runc
[20.10 backport] update containerd binary to v1.6.3, runc v1.1.1
This commit is contained in:
commit
0809f5fafb
2 changed files with 2 additions and 2 deletions
|
@ -15,7 +15,7 @@ set -e
|
|||
# the binary version you may also need to update the vendor version to pick up
|
||||
# bug fixes or new APIs, however, usually the Go packages are built from a
|
||||
# commit from the master branch.
|
||||
: "${CONTAINERD_VERSION:=v1.5.11}"
|
||||
: "${CONTAINERD_VERSION:=v1.6.3}"
|
||||
|
||||
install_containerd() (
|
||||
echo "Install containerd version $CONTAINERD_VERSION"
|
||||
|
|
|
@ -9,7 +9,7 @@ set -e
|
|||
# the containerd project first, and update both after that is merged.
|
||||
#
|
||||
# When updating RUNC_VERSION, consider updating runc in vendor.conf accordingly
|
||||
: "${RUNC_VERSION:=v1.0.3}"
|
||||
: "${RUNC_VERSION:=v1.1.1}"
|
||||
|
||||
install_runc() {
|
||||
RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp"}"
|
||||
|
|
Loading…
Reference in a new issue