Переглянути джерело

Merge pull request #45139 from thaJeztah/containerd_binary_1.7.0_rc.3

update containerd binary to v1.7.0
Sebastiaan van Stijn 2 роки тому
батько
коміт
5e9ecffb4f
3 змінених файлів з 3 додано та 3 видалено
  1. 1 1
      Dockerfile
  2. 1 1
      Dockerfile.windows
  3. 1 1
      hack/dockerfile/install/containerd.installer

+ 1 - 1
Dockerfile

@@ -192,7 +192,7 @@ RUN git init . && git remote add origin "https://github.com/containerd/container
 # When updating 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.
-ARG CONTAINERD_VERSION=v1.7.0-beta.4
+ARG CONTAINERD_VERSION=v1.7.0
 RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
 
 FROM base AS containerd-build

+ 1 - 1
Dockerfile.windows

@@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 ARG GO_VERSION=1.20.2
 ARG GOTESTSUM_VERSION=v1.8.2
 ARG GOWINRES_VERSION=v0.3.0
-ARG CONTAINERD_VERSION=v1.7.0-beta.4
+ARG CONTAINERD_VERSION=v1.7.0
 
 # Environment variable notes:
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

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