beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #47692 from vvoland/v26.0-47689

Browse source 
[26.0 backport] update containerd binary to v1.7.15
This commit is contained in:
Sebastiaan van Stijn 2024-04-09 09:42:11 +02:00 committed by GitHub
commit 8730cccee2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -198,7 +198,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 # 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 # version to pick up bug fixes or new APIs, however, usually the Go packages
# are built from a commit from the master branch. # are built from a commit from the master branch.
ARG CONTAINERD_VERSION=v1.7.13 ARG CONTAINERD_VERSION=v1.7.15
RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
FROM base AS containerd-build FROM base AS containerd-build

2
Dockerfile.windows
View file

@ -164,7 +164,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
ARG GO_VERSION=1.21.9 ARG GO_VERSION=1.21.9
ARG GOTESTSUM_VERSION=v1.8.2 ARG GOTESTSUM_VERSION=v1.8.2
ARG GOWINRES_VERSION=v0.3.1 ARG GOWINRES_VERSION=v0.3.1
ARG CONTAINERD_VERSION=v1.7.13 ARG CONTAINERD_VERSION=v1.7.15
# Environment variable notes: # Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux. # - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

2
hack/dockerfile/install/containerd.installer
View file

@ -15,7 +15,7 @@ set -e
# the binary version you may also need to update the vendor version to pick up # 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 # bug fixes or new APIs, however, usually the Go packages are built from a
# commit from the master branch. # commit from the master branch.
: "${CONTAINERD_VERSION:=v1.7.13}" : "${CONTAINERD_VERSION:=v1.7.15}"
install_containerd() ( install_containerd() (
echo "Install containerd version $CONTAINERD_VERSION" echo "Install containerd version $CONTAINERD_VERSION"