Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Cherry-picked to v1.7.5] update CNI plugins (1.4.1), RootlessKit (2.0.2), Kubo (0.27.0) #2878

Merged
merged 3 commits into from
Mar 13, 2024
Merged

[Cherry-picked to v1.7.5] update CNI plugins (1.4.1), RootlessKit (2.0.2), Kubo (0.27.0) #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dbac7f
update CNI plugins (1.4.1)
AkihiroSuda Mar 13, 2024
4917c16
update RootlessKit (2.0.2)
AkihiroSuda Mar 13, 2024
ee2f8d6
update Kubo (0.27.0)
AkihiroSuda Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,31 +162,31 @@ 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
rootlesskit: v1.1.1
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
rootlesskit: v1.1.1
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
rootlesskit: v1.1.1
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 }}"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,15 +29,15 @@ 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
# Extra deps: FUSE-OverlayFS
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
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.0
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1511f6c003ace805eafeb1132727791326283cff88a923d76329e1892bba7a10 cni-plugins-linux-amd64-v1.4.1.tgz
72644e13557cda8a5b39baf97fc5e93d23fdf7baba7700000e7e9efd8bdf9234 cni-plugins-linux-arm64-v1.4.1.tgz
6 changes: 0 additions & 6 deletions Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.1
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading