diff options
| author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2023-05-15 15:40:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 15:40:33 +0100 |
| commit | 1331b8c39a601c77d678f3e03f3f39cb07aa5f76 (patch) | |
| tree | cde30749f107b5479e3fae43c0763916566eafe7 | |
| parent | a5b597ea51348f5f922fdd2167cba8f57c6961f3 (diff) | |
| parent | 907f037141b41d0a96daa379fd2cbd0b0eee7569 (diff) | |
| download | docker-24.0.tar.gz | |
[24.0 backport] update containerd binary to v1.7.1
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.windows | 2 | ||||
| -rwxr-xr-x | hack/dockerfile/install/containerd.installer | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index a610a45e9d..2ffcb830d9 100644 --- a/Dockerfile +++ b/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 +ARG CONTAINERD_VERSION=v1.7.1 RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD FROM base AS containerd-build diff --git a/Dockerfile.windows b/Dockerfile.windows index c3ecc56ef9..43258035d2 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ARG GO_VERSION=1.20.4 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.0 -ARG CONTAINERD_VERSION=v1.7.0 +ARG CONTAINERD_VERSION=v1.7.1 # Environment variable notes: # - GO_VERSION must be consistent with 'Dockerfile' used by Linux. diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index bd150ca10a..bfdd27612f 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/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}" +: "${CONTAINERD_VERSION:=v1.7.1}" install_containerd() ( echo "Install containerd version $CONTAINERD_VERSION" |