Skip to content

Commit

Permalink
Merge pull request #48199 from austinvazquez/update-containerd-binary…
Browse files Browse the repository at this point in the history
…-to-1.7.20

[25.0 backport] Update containerd binary to 1.7.20
thaJeztah authored Jul 20, 2024
2 parents ed11c9c + e8ecb9c commit b722836
Showing 4 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
# 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.13
ARG CONTAINERD_VERSION=v1.7.20
RUN git fetch -q --depth 1 origin "${CONTAINERD_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD

FROM base AS containerd-build
2 changes: 1 addition & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -164,7 +164,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
ARG GO_VERSION=1.21.12
ARG GOTESTSUM_VERSION=v1.8.2
ARG GOWINRES_VERSION=v0.3.1
ARG CONTAINERD_VERSION=v1.7.13
ARG CONTAINERD_VERSION=v1.7.20

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

install_containerd() (
echo "Install containerd version $CONTAINERD_VERSION"
13 changes: 11 additions & 2 deletions integration/system/disk_usage_test.go
Original file line number Diff line number Diff line change
@@ -18,8 +18,6 @@ import (
func TestDiskUsage(t *testing.T) {
skip.If(t, testEnv.DaemonInfo.OSType == "windows") // d.Start fails on Windows with `protocol not available`

t.Parallel()

ctx := testutil.StartSpan(baseContext, t)

d := daemon.New(t)
@@ -38,7 +36,18 @@ func TestDiskUsage(t *testing.T) {
next: func(t *testing.T, _ types.DiskUsage) types.DiskUsage {
du, err := client.DiskUsage(ctx, types.DiskUsageOptions{})
assert.NilError(t, err)

expectedLayersSize := int64(0)
// TODO: Investigate https://github.com/moby/moby/issues/47119
// Make 4096 (block size) also a valid value for zero usage.
if testEnv.UsingSnapshotter() && testEnv.IsRootless() {
if du.LayersSize == 4096 {
expectedLayersSize = du.LayersSize
}
}

assert.DeepEqual(t, du, types.DiskUsage{
LayersSize: expectedLayersSize,
Images: []*image.Summary{},
Containers: []*types.Container{},
Volumes: []*volume.Volume{},

0 comments on commit b722836

Please sign in to comment.