From ec728349b758fa995688758c9208ba48763839eb Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 25 Nov 2023 10:29:15 +0900 Subject: [PATCH 1/3] update containerd (1.7.9) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 18 +++++++++--------- Dockerfile | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2a98c56dcb4..5e3f595de3f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,9 +79,9 @@ jobs: - ubuntu: 20.04 containerd: v1.6.24 - ubuntu: 20.04 - containerd: v1.7.8 + containerd: v1.7.9 - ubuntu: 22.04 - containerd: v1.7.8 + containerd: v1.7.9 - 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.8 + containerd: v1.7.9 env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -160,10 +160,10 @@ jobs: containerd: v1.6.24 target: test-integration-rootless - ubuntu: 20.04 - containerd: v1.7.8 + containerd: v1.7.9 target: test-integration-rootless - ubuntu: 22.04 - containerd: v1.7.8 + containerd: v1.7.9 target: test-integration-rootless - ubuntu: 22.04 containerd: main @@ -172,10 +172,10 @@ jobs: containerd: v1.6.24 target: test-integration-rootless-port-slirp4netns - ubuntu: 20.04 - containerd: v1.7.8 + containerd: v1.7.9 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 - containerd: v1.7.8 + containerd: v1.7.9 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 containerd: main @@ -267,7 +267,7 @@ jobs: - uses: actions/checkout@v4.1.1 with: repository: containerd/containerd - ref: v1.7.8 + ref: v1.7.9 path: containerd fetch-depth: 1 - name: "Set up CNI" @@ -275,7 +275,7 @@ jobs: run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows - name: "Set up containerd" env: - ctrdVersion: 1.7.8 + ctrdVersion: 1.7.9 run: powershell hack/configure-windows-ci.ps1 # TODO: Run unit tests - name: "Run integration tests" diff --git a/Dockerfile b/Dockerfile index 7b9d2d71987..5ea2d80e3ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v1.7.8 +ARG CONTAINERD_VERSION=v1.7.9 ARG RUNC_VERSION=v1.1.10 ARG CNI_PLUGINS_VERSION=v1.3.0 From e080801632858765ec1c6ac6da8c302ea3de064c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 25 Nov 2023 10:33:56 +0900 Subject: [PATCH 2/3] update Kubo (0.24.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5ea2d80e3ae..6f325afa0a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ ARG BYPASS4NETNS_VERSION=v0.3.0 ARG FUSE_OVERLAYFS_VERSION=v1.13 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8 # Extra deps: IPFS -ARG KUBO_VERSION=v0.23.0 +ARG KUBO_VERSION=v0.24.0 # Extra deps: Init ARG TINI_VERSION=v0.19.0 # Extra deps: Debug From aeeb338b0fb7df144277510e6d0ce4cab5ff96e1 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 25 Nov 2023 10:34:10 +0900 Subject: [PATCH 3/3] update Nydus (2.2.4) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6f325afa0a5..043d2367e34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ ARG GO_VERSION=1.21 ARG UBUNTU_VERSION=22.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 ARG GOTESTSUM_VERSION=v1.11.0 -ARG NYDUS_VERSION=v2.2.3 +ARG NYDUS_VERSION=v2.2.4 ARG SOCI_SNAPSHOTTER_VERSION=0.4.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.3.0 AS xx