From 4dbac7f878b4438e463a17041ddee39a26376bc6 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 13 Mar 2024 17:12:05 +0900 Subject: [PATCH 1/3] update CNI plugins (1.4.1) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.0 | 2 -- Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1 | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.0 create mode 100644 Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1 diff --git a/Dockerfile b/Dockerfile index e62142fcbdc..68f062d1ce8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ # Basic deps ARG CONTAINERD_VERSION=v1.7.14 ARG RUNC_VERSION=v1.1.12 -ARG CNI_PLUGINS_VERSION=v1.4.0 +ARG CNI_PLUGINS_VERSION=v1.4.1 # Extra deps: Build ARG BUILDKIT_VERSION=v0.13.0 diff --git a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.0 b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.0 deleted file mode 100644 index f78938c4f04..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.0 +++ /dev/null @@ -1,2 +0,0 @@ -c2485ddb3ffc176578ae30ae58137f0b88e50f7c7f2af7d53a569276b2949a33 cni-plugins-linux-amd64-v1.4.0.tgz -304d4389d5b732b7a73513d002c4895f731d030682d40653f411e10e39114194 cni-plugins-linux-arm64-v1.4.0.tgz diff --git a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1 b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1 new file mode 100644 index 00000000000..0baa626f8ab --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1 @@ -0,0 +1,2 @@ +1511f6c003ace805eafeb1132727791326283cff88a923d76329e1892bba7a10 cni-plugins-linux-amd64-v1.4.1.tgz +72644e13557cda8a5b39baf97fc5e93d23fdf7baba7700000e7e9efd8bdf9234 cni-plugins-linux-arm64-v1.4.1.tgz From 4917c16a45eedf878d05b01217a8dd050267e944 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 13 Mar 2024 17:19:21 +0900 Subject: [PATCH 2/3] update RootlessKit (2.0.2) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 8 ++++---- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.1 | 6 ------ Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.2 | 6 ++++++ 4 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.1 create mode 100644 Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f2abe4ebeb..59955e8838f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -162,7 +162,7 @@ jobs: target: test-integration-rootless - ubuntu: 20.04 containerd: v1.7.14 - rootlesskit: v2.0.1 + rootlesskit: v2.0.2 target: test-integration-rootless - ubuntu: 22.04 containerd: v1.7.14 @@ -170,7 +170,7 @@ jobs: target: test-integration-rootless - ubuntu: 22.04 containerd: main - rootlesskit: v2.0.1 + rootlesskit: v2.0.2 target: test-integration-rootless - ubuntu: 20.04 containerd: v1.6.30 @@ -178,7 +178,7 @@ jobs: target: test-integration-rootless-port-slirp4netns - ubuntu: 20.04 containerd: v1.7.14 - rootlesskit: v2.0.1 + rootlesskit: v2.0.2 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 containerd: v1.7.14 @@ -186,7 +186,7 @@ jobs: target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 containerd: main - rootlesskit: v2.0.1 + rootlesskit: v2.0.2 target: test-integration-rootless-port-slirp4netns env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" diff --git a/Dockerfile b/Dockerfile index 68f062d1ce8..c54cdc6eda3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption ARG IMGCRYPT_VERSION=v1.1.9 # Extra deps: Rootless -ARG ROOTLESSKIT_VERSION=v2.0.1 +ARG ROOTLESSKIT_VERSION=v2.0.2 ARG SLIRP4NETNS_VERSION=v1.2.3 # Extra deps: bypass4netns ARG BYPASS4NETNS_VERSION=v0.4.0 diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.1 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.1 deleted file mode 100644 index 6923226f370..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.1 +++ /dev/null @@ -1,6 +0,0 @@ -d250ae03e58541bce83842f8ec4f2190a2a55a437a3c9c156c1f20093522cca1 rootlesskit-aarch64.tar.gz -386745a013dc38681a2f797cb13d466f99c351d613c687ad4540449088deaa36 rootlesskit-armv7l.tar.gz -9569dc8efdb6dd07b8ce81c45f607b15f7bb41b55cfa7f15ad3cb6ae85061d82 rootlesskit-ppc64le.tar.gz -064b10c554c19a4d86934d825e37a97e83e3bc92ec70f0460c9533a383794804 rootlesskit-riscv64.tar.gz -9d03267f3a18c4d78055f877d5b0dc2e08e8d019d7b3e866e3361ef528ae0dda rootlesskit-s390x.tar.gz -6b1ecb61a48d85e6b41c4a67b81f6db47f626e010a481666a1859776b45439aa rootlesskit-x86_64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.2 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.2 new file mode 100644 index 00000000000..4e284401a0e --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.2 @@ -0,0 +1,6 @@ +4dafc86e1cbee2fbedac6822bf46e459d54ec998803d273f535b67a6e62edb30 rootlesskit-aarch64.tar.gz +c633c5e7f84d3390c4ebe8102af0cd8bdecd1f10e9fc007036636ef94d95b449 rootlesskit-armv7l.tar.gz +598a2c685cd383ba1abd3bf20a5c1bd55c283ceea1b3a9479c76f0fb96df75d5 rootlesskit-ppc64le.tar.gz +af9bbb79de33b0b3f901b3848341ae4b05ca4e0838f103044f082aab91f3b7f5 rootlesskit-riscv64.tar.gz +b1539a7f8059150f8dfdfc4de3a2714a199c09fdfe9c7670ce69824b8fdad7b9 rootlesskit-s390x.tar.gz +a218beb65d243183d13024a8b18fc08543e238ef38d306166e8375bde0efd57c rootlesskit-x86_64.tar.gz From ee2f8d64aa3bee5fb9f02644dbddb1b44b532dfa Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 13 Mar 2024 17:21:21 +0900 Subject: [PATCH 3/3] update Kubo (0.27.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c54cdc6eda3..2ed174ecb24 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.26.0 +ARG KUBO_VERSION=v0.27.0 # Extra deps: Init ARG TINI_VERSION=v0.19.0 # Extra deps: Debug