From 3ab02f69554537a997dbf2c2e8515bdd3c7899b3 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:13:58 +0900 Subject: [PATCH 1/4] update containerd (1.7.13) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 24 ++++++++++++------------ Dockerfile | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b69cd64646d..683c3e7cbc0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,11 +77,11 @@ jobs: # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2 include: - ubuntu: 20.04 - containerd: v1.6.26 + containerd: v1.6.28 - ubuntu: 20.04 - containerd: v1.7.11 + containerd: v1.7.13 - ubuntu: 22.04 - containerd: v1.7.11 + containerd: v1.7.13 - ubuntu: 22.04 containerd: main env: @@ -113,7 +113,7 @@ jobs: # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2 include: - ubuntu: 22.04 - containerd: v1.7.11 + containerd: v1.7.13 env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -157,15 +157,15 @@ jobs: # ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2 include: - ubuntu: 20.04 - containerd: v1.6.26 + containerd: v1.6.28 rootlesskit: v1.1.1 target: test-integration-rootless - ubuntu: 20.04 - containerd: v1.7.11 + containerd: v1.7.13 rootlesskit: v2.0.0 target: test-integration-rootless - ubuntu: 22.04 - containerd: v1.7.11 + containerd: v1.7.13 rootlesskit: v1.1.1 target: test-integration-rootless - ubuntu: 22.04 @@ -173,15 +173,15 @@ jobs: rootlesskit: v2.0.0 target: test-integration-rootless - ubuntu: 20.04 - containerd: v1.6.26 + containerd: v1.6.28 rootlesskit: v1.1.1 target: test-integration-rootless-port-slirp4netns - ubuntu: 20.04 - containerd: v1.7.11 + containerd: v1.7.13 rootlesskit: v2.0.0 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 - containerd: v1.7.11 + containerd: v1.7.13 rootlesskit: v1.1.1 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 @@ -275,7 +275,7 @@ jobs: - uses: actions/checkout@v4.1.1 with: repository: containerd/containerd - ref: v1.7.11 + ref: v1.7.13 path: containerd fetch-depth: 1 - name: "Set up CNI" @@ -283,7 +283,7 @@ jobs: run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows - name: "Set up containerd" env: - ctrdVersion: 1.7.11 + ctrdVersion: 1.7.13 run: powershell hack/configure-windows-ci.ps1 # TODO: Run unit tests - name: "Run integration tests" diff --git a/Dockerfile b/Dockerfile index 05e8b6d1d96..591bca37f06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v1.7.11 +ARG CONTAINERD_VERSION=v1.7.13 ARG RUNC_VERSION=v1.1.11 ARG CNI_PLUGINS_VERSION=v1.4.0 From 02dc9b44cf7d20b0ec1191072948e3bb0d8d0e92 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:14:32 +0900 Subject: [PATCH 2/4] update runc (1.1.12) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 591bca37f06..cc3a995beff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ # Basic deps ARG CONTAINERD_VERSION=v1.7.13 -ARG RUNC_VERSION=v1.1.11 +ARG RUNC_VERSION=v1.1.12 ARG CNI_PLUGINS_VERSION=v1.4.0 # Extra deps: Build From ad02e192db74d06c44cc3b3c9c8e049f401abc02 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:15:34 +0900 Subject: [PATCH 3/4] update bypass4netns (0.4.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cc3a995beff..bd414c8046f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ ARG IMGCRYPT_VERSION=v1.1.9 ARG ROOTLESSKIT_VERSION=v2.0.0 ARG SLIRP4NETNS_VERSION=v1.2.2 # Extra deps: bypass4netns -ARG BYPASS4NETNS_VERSION=v0.3.0 +ARG BYPASS4NETNS_VERSION=v0.4.0 # Extra deps: FUSE-OverlayFS ARG FUSE_OVERLAYFS_VERSION=v1.13 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8 From dc7bbed8667d49d559021117af5f1d20a61d7fef Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:16:54 +0900 Subject: [PATCH 4/4] update Kubo (0.26.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bd414c8046f..5a82c52b60c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ ARG BYPASS4NETNS_VERSION=v0.4.0 ARG FUSE_OVERLAYFS_VERSION=v1.13 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8 # Extra deps: IPFS -ARG KUBO_VERSION=v0.24.0 +ARG KUBO_VERSION=v0.26.0 # Extra deps: Init ARG TINI_VERSION=v0.19.0 # Extra deps: Debug