فهرست منبع

Merge pull request #43919 from thaJeztah/22.06_backport_bump_containerd_1.6.7_binary

[22.06 backport] update containerd binary too v1.6.7, runc to v1.3.1
Tianon Gravi 2 سال پیش
والد
کامیت
f47d5ced16
3فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 1 1
      Dockerfile.windows
  2. 1 1
      hack/dockerfile/install/containerd.installer
  3. 1 1
      hack/dockerfile/install/runc.installer

+ 1 - 1
Dockerfile.windows

@@ -166,7 +166,7 @@ FROM microsoft/windowsservercore
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ARG GO_VERSION=1.18.5
-ARG CONTAINERD_VERSION=v1.6.6
+ARG CONTAINERD_VERSION=v1.6.7
 ARG GOTESTSUM_VERSION=v1.8.1
 ARG GOWINRES_VERSION=v0.2.3
 

+ 1 - 1
hack/dockerfile/install/containerd.installer

@@ -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.6.6}"
+: "${CONTAINERD_VERSION:=v1.6.7}"
 
 install_containerd() (
 	echo "Install containerd version $CONTAINERD_VERSION"

+ 1 - 1
hack/dockerfile/install/runc.installer

@@ -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.mod accordingly
-: "${RUNC_VERSION:=v1.1.2}"
+: "${RUNC_VERSION:=v1.1.3}"
 
 install_runc() {
 	RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp"}"