Skip to content

update containerd (v1.5.5), slirp4netns (v1.1.12), fuse-overlayfs (v1.7), RootlessKit (v0.14.4) #306

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

Merged
merged 1 commit into from
Aug 4, 2021
Merged

update containerd (v1.5.5), slirp4netns (v1.1.12), fuse-overlayfs (v1.7), RootlessKit (v0.14.4) #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
timeout-minutes: 20
strategy:
matrix:
containerd: [1.4.5, 1.5.4]
containerd: [1.4.5, 1.5.5]
env:
CONTAINERD_VERSION: "${{ matrix.containerd }}"
steps:
Expand All @@ -78,7 +78,7 @@ jobs:
timeout-minutes: 20
strategy:
matrix:
containerd: [1.4.5, 1.5.4]
containerd: [1.4.5, 1.5.5]
env:
CONTAINERD_VERSION: "${{ matrix.containerd }}"
steps:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Usage: `docker run -it --privileged <IMAGE>`. Make sure to add `-t` and `--privileged`.

# Basic deps
ARG CONTAINERD_VERSION=1.5.4
ARG CONTAINERD_VERSION=1.5.5
ARG RUNC_VERSION=1.0.1
ARG CNI_PLUGINS_VERSION=0.9.1

Expand All @@ -29,10 +29,10 @@ ARG STARGZ_SNAPSHOTTER_VERSION=0.7.0
# Extra deps: Encryption
ARG IMGCRYPT_VERSION=1.1.1
# Extra deps: Rootless
ARG ROOTLESSKIT_VERSION=0.14.2
ARG SLIRP4NETNS_VERSION=1.1.11
ARG ROOTLESSKIT_VERSION=0.14.4
ARG SLIRP4NETNS_VERSION=1.1.12
# Extra deps: FUSE-OverlayFS
ARG FUSE_OVERLAYFS_VERSION=1.6
ARG FUSE_OVERLAYFS_VERSION=1.7
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=1.0.3

# Test deps
Expand Down
4 changes: 0 additions & 4 deletions Dockerfile.d/SHA256SUMS.d/containerd-1.5.4
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/containerd-1.5.5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# From https://github.com/kind-ci/containerd-nightlies/releases/tag/containerd-1.5.5
8130d1db8ba5a45678013465fc8dfebb252fc9bf068248c06f9dbb5d8554a5f7 containerd-1.5.5.linux-amd64.tar.gz
c452b52bd5ce3f788bbfbd39741c9066752803aaca5fa6da79b9658902a3a2ec containerd-1.5.5.linux-arm64.tar.gz
16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service
5 changes: 0 additions & 5 deletions Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.6
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
c095fa1185ef87cd44c6390c3ace4b8e039eedcd1d8ab426c752a5e39b4f91ec fuse-overlayfs-aarch64
1cb63738341289d846556866b7ab90813c43e69b2d75a4ec0f127405b44af872 fuse-overlayfs-armv7l
d416d5b3bdf90f82bdaf359fd8bc3710c6e0316fa756943b6571ab538bf5db7e fuse-overlayfs-ppc64le
2a4879ad6d312fd76004cfa0b13b87c50b8385f3a3926e0d46adb8c75c9ff604 fuse-overlayfs-s390x
b7bcf746bdf940e5dde8f1fb29afb65c6abbbe4f4af9d94533dd10f95ccd65d2 fuse-overlayfs-x86_64
5 changes: 0 additions & 5 deletions Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.2
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
7db71091eff7ad10317189a222bc8f41efb938a1d4624cc332e64e497d27798b rootlesskit-aarch64.tar.gz
18b156e964643744b1f352cc3f793b399b509b14f03ab04a793750dd2e9a2eed rootlesskit-armv7l.tar.gz
ab1ae155349941d402328d2d021d6137de45dd57d119cc229c1929c103920fcc rootlesskit-ppc64le.tar.gz
d59f88e4e9b82f46b147e388e88e8c01c61df09c70fc24f95f651f18b09eb19c rootlesskit-s390x.tar.gz
2f0d91ba9fedbd26f627322b4a5fc25d9341228f80a2c2326b3871f25f919429 rootlesskit-x86_64.tar.gz
5 changes: 0 additions & 5 deletions Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.11
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.12
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
5316a75b5b1e338520ea7288a40f384f54419e99339beaf0bd3f3d534ee90d9a slirp4netns-aarch64
fa8a142418fcf4e91ef61a17ebcc2f411015e7402abae2fd53cbaaee494b32e5 slirp4netns-armv7l
f03b3ea07c534b5f8a253dee67615f0d8ee417117132d22e4cb6a4bce04e4fb3 slirp4netns-ppc64le
0ea2b05fd32cd5698a9dac58fc28750ad48743bad556e69766cfeda1283c1f91 slirp4netns-s390x
fb8d7928205bb573b9207705cab7300d0544959a4a1ffb4ec1fc6e219d859370 slirp4netns-x86_64
10 changes: 7 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ require (
github.com/compose-spec/compose-go v0.0.0-20210716132856-efad24e892ce
github.com/containerd/cgroups v1.0.1
github.com/containerd/console v1.0.2
github.com/containerd/containerd v1.5.4
github.com/containerd/containerd v1.5.5
github.com/containerd/containerd/api v0.0.0
github.com/containerd/continuity v0.1.0
github.com/containerd/go-cni v1.0.3-0.20210427061315-4efee5f0b4db
github.com/containerd/imgcrypt v1.1.1
Expand All @@ -30,7 +31,7 @@ require (
github.com/opencontainers/image-spec v1.0.1
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
github.com/pkg/errors v0.9.1
github.com/rootless-containers/rootlesskit v0.14.2
github.com/rootless-containers/rootlesskit v0.14.4
github.com/sirupsen/logrus v1.8.1
github.com/tidwall/gjson v1.8.1
github.com/urfave/cli/v2 v2.3.0
Expand All @@ -41,4 +42,7 @@ require (
gotest.tools/v3 v3.0.3
)

replace github.com/containerd/containerd => github.com/containerd/containerd v1.5.1-0.20210617170851-f0a32c66dad1
replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.5.1-0.20210802172229-7d4891783aac
github.com/containerd/containerd/api => github.com/containerd/containerd/api v0.0.0-20210802172229-7d4891783aac
)
Loading