Skip to content

Commit

Permalink
Merge pull request #46103 from thaJeztah/24.0_backport_update_contain…
Browse files Browse the repository at this point in the history
…erd_binary_1.7.3

[24.0 backport] update containerd binary to v1.7.3
  • Loading branch information
AkihiroSuda committed Jul 30, 2023
2 parents 77e2d29 + 02241b0 commit e426ae0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,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.1
ARG CONTAINERD_VERSION=v1.7.3
RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD

FROM base AS containerd-build
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
ARG GO_VERSION=1.20.6
ARG GOTESTSUM_VERSION=v1.8.2
ARG GOWINRES_VERSION=v0.3.0
ARG CONTAINERD_VERSION=v1.7.1
ARG CONTAINERD_VERSION=v1.7.3

# Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
Expand Down
2 changes: 1 addition & 1 deletion hack/dockerfile/install/containerd.installer
Original file line number Diff line number Diff line change
Expand Up @@ -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.1}"
: "${CONTAINERD_VERSION:=v1.7.3}"

install_containerd() (
echo "Install containerd version $CONTAINERD_VERSION"
Expand Down

0 comments on commit e426ae0

Please sign in to comment.