From b44116e17f4ca54af00d3dce31f8068d88074982 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 8 Dec 2022 13:25:28 +0900 Subject: [PATCH 1/2] update containerd (1.6.12) Signed-off-by: Akihiro Suda --- .cirrus.yml | 2 +- .github/workflows/test.yml | 8 ++++---- Dockerfile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index a1ca02a6971..b13f75fa6c8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -30,7 +30,7 @@ windows_task: matrix: - name: "Windows/containerd-1.6" env: - ctrdVersion: 1.6.10 + ctrdVersion: 1.6.12 env: CGO_ENABLED: 0 build_script: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 967258f421c..a7ec7913aeb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,9 +68,9 @@ jobs: - ubuntu: 20.04 containerd: v1.5.13 - ubuntu: 20.04 - containerd: v1.6.10 + containerd: v1.6.12 - ubuntu: 22.04 - containerd: v1.6.10 + containerd: v1.6.12 - ubuntu: 22.04 containerd: main env: @@ -104,9 +104,9 @@ jobs: - ubuntu: 20.04 containerd: v1.5.13 - ubuntu: 20.04 - containerd: v1.6.10 + containerd: v1.6.12 - ubuntu: 22.04 - containerd: v1.6.10 + containerd: v1.6.12 - ubuntu: 22.04 containerd: main env: diff --git a/Dockerfile b/Dockerfile index e2b8070136d..1a867780326 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v1.6.10 +ARG CONTAINERD_VERSION=v1.6.12 ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 From e772c36778ac4cda241a7eaddf72256aea903b2b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 8 Dec 2022 13:28:01 +0900 Subject: [PATCH 2/2] update fuse-overlayfs (1.10) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.10 | 6 ++++++ Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.9 | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.10 delete mode 100644 Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.9 diff --git a/Dockerfile b/Dockerfile index 1a867780326..31d656e419c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ ARG SLIRP4NETNS_VERSION=v1.2.0 # Extra deps: bypass4netns ARG BYPASS4NETNS_VERSION=v0.3.0 # Extra deps: FUSE-OverlayFS -ARG FUSE_OVERLAYFS_VERSION=v1.9 +ARG FUSE_OVERLAYFS_VERSION=v1.10 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.5 # Extra deps: IPFS ARG KUBO_VERSION=v0.17.0 diff --git a/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.10 b/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.10 new file mode 100644 index 00000000000..1fee2c8f11e --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.10 @@ -0,0 +1,6 @@ +41ba3e8d484643d08432627e92fa7021cac89b6570a52f0f84a73f8d8f01576f fuse-overlayfs-aarch64 +66ee60cfdc0e123840952cd2638564324b7bfe07cef6fd0d40cae6dbea8b8368 fuse-overlayfs-armv7l +c4392f29c351a19da27f460fc3f52d161969ac99f72fc5fc46c8efcbf566fd0d fuse-overlayfs-ppc64le +95302656588be3a614c06e353e5f1024c64a4a3bef03fe2caf3fd1b220768ccc fuse-overlayfs-riscv64 +b3e8e814cb3213929dfaefd205db043e989645292b71d8f0be5883f2273c0528 fuse-overlayfs-s390x +8ca67de5273fa2b100a817694c9c8119b884c0ea9664d896ac920bc8ba711dda fuse-overlayfs-x86_64 diff --git a/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.9 b/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.9 deleted file mode 100644 index 42771adbcb5..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.9 +++ /dev/null @@ -1,6 +0,0 @@ -a28fe7fdaeb5fbe8e7a109ff02b2abbae69301bb7e0446c855023edf58be51c3 fuse-overlayfs-aarch64 -cf863acacf008b31b36a031855bacaf1db1fcc0877a1c78127dada9bc0c96c5a fuse-overlayfs-armv7l -e9df32f9ae46d10e525e075fd1e6ba3284d179d030a5edb03b839791349eac60 fuse-overlayfs-ppc64le -24c4861711b27ee704d156534ed5f8b3070df6c401e25b8abc1597f901d59784 fuse-overlayfs-riscv64 -693c70932df666b71397163a604853362e8316e734e7202fdf342b0f6096b874 fuse-overlayfs-s390x -3809625c3ecd9e13eb2fad709ddc6778944bbabe50ce1976b08085a035fea0aa fuse-overlayfs-x86_64