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.

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

update containerd (2.0.2), RootlessKit (2.3.2), bypass4netns (0.4.2), containerd-fuse-overlayfs (2.1.1), BuildKit (0.19.0) #3826

Merged
merged 5 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
containerd: v1.7.25
arch: amd64
- runner: ubuntu-24.04
containerd: v2.0.1
containerd: v2.0.2
arch: amd64
- runner: arm64-8core-32gb
containerd: v2.0.1
containerd: v2.0.2
arch: arm64
env:
CONTAINERD_VERSION: "${{ matrix.containerd }}"
Expand Down Expand Up @@ -113,11 +113,11 @@ jobs:
runner: "ubuntu-22.04"
arch: amd64
- ubuntu: 24.04
containerd: v2.0.1
containerd: v2.0.2
runner: "ubuntu-24.04"
arch: amd64
- ubuntu: 24.04
containerd: v2.0.1
containerd: v2.0.2
runner: arm64-8core-32gb
arch: arm64
env:
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
matrix:
include:
- ubuntu: 24.04
containerd: v2.0.1
containerd: v2.0.2
arch: amd64
env:
CONTAINERD_VERSION: "${{ matrix.containerd }}"
Expand Down Expand Up @@ -235,17 +235,17 @@ jobs:
arch: amd64
- ubuntu: 22.04
containerd: v1.7.25
rootlesskit: v2.3.1
rootlesskit: v2.3.2
target: rootless
arch: amd64
- ubuntu: 24.04
containerd: v2.0.1
rootlesskit: v2.3.1
containerd: v2.0.2
rootlesskit: v2.3.2
target: rootless
arch: amd64
- ubuntu: 24.04
containerd: v1.7.25
rootlesskit: v2.3.1
rootlesskit: v2.3.2
target: rootless-port-slirp4netns
arch: amd64
env:
Expand Down Expand Up @@ -403,7 +403,7 @@ jobs:
key: vagrant-${{ matrix.box }}
- name: Set up vagrant
run: |
# from https://github.com/containerd/containerd/blob/v2.0.1/.github/workflows/ci.yml#L583-L596
# from https://github.com/containerd/containerd/blob/v2.0.2/.github/workflows/ci.yml#L583-L596
# which is based on https://github.com/opencontainers/runc/blob/v1.1.8/.cirrus.yml#L41-L49
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@
# TODO: verify commit hash

# Basic deps
ARG CONTAINERD_VERSION=v2.0.1
ARG CONTAINERD_VERSION=v2.0.2
ARG RUNC_VERSION=v1.2.4
ARG CNI_PLUGINS_VERSION=v1.6.2

# Extra deps: Build
ARG BUILDKIT_VERSION=v0.18.2
ARG BUILDKIT_VERSION=v0.19.0
# Extra deps: Lazy-pulling
ARG STARGZ_SNAPSHOTTER_VERSION=v0.16.3
# Extra deps: Encryption
ARG IMGCRYPT_VERSION=v2.0.0
# Extra deps: Rootless
ARG ROOTLESSKIT_VERSION=v2.3.1
ARG ROOTLESSKIT_VERSION=v2.3.2
ARG SLIRP4NETNS_VERSION=v1.3.1
# Extra deps: bypass4netns
ARG BYPASS4NETNS_VERSION=v0.4.1
ARG BYPASS4NETNS_VERSION=v0.4.2
# Extra deps: FUSE-OverlayFS
ARG FUSE_OVERLAYFS_VERSION=v1.14
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.0
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.1
# Extra deps: Init
ARG TINI_VERSION=v0.19.0
# Extra deps: Debug
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/buildkit-v0.18.2

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/buildkit-v0.19.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
9993fdd8b454e541ac14a1adf4bf53d271dbc8f3aafde45894bf689604a0a5cf buildkit-v0.19.0.linux-amd64.tar.gz
be7f7922d8f5eea02704cd707fb62b5a18e272452243804601b523ae6bef0ef5 buildkit-v0.19.0.linux-arm64.tar.gz
6 changes: 0 additions & 6 deletions Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.0

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
2061a4064d163544f69e36fe56d008ab90f791906d5a96bddf87d3151fdde836 containerd-fuse-overlayfs-2.1.1-linux-amd64.tar.gz
99d08b0f41ede108f36efb9b5d8e0613be69336785cf97a73074487b52d9e71e containerd-fuse-overlayfs-2.1.1-linux-arm-v7.tar.gz
2219bf91d943480ce7021d6fce956379050757a500d36540b4372d45616c74eb containerd-fuse-overlayfs-2.1.1-linux-arm64.tar.gz
a2515f00553334b23470d52b088e49c3aa69aa9d66163dc14f188684bc8c774d containerd-fuse-overlayfs-2.1.1-linux-ppc64le.tar.gz
ae0fc07af2d34fb4c599364f82570ec43fed07f1892e493726f5414ecf8c8908 containerd-fuse-overlayfs-2.1.1-linux-riscv64.tar.gz
1200244a100b2433cc98a7ec8a0138073e9ad1c5e11ed503f5d2b3063dd40197 containerd-fuse-overlayfs-2.1.1-linux-s390x.tar.gz
6 changes: 0 additions & 6 deletions Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
0a4ed18c6794bfe5821cc6548f52b26b3b2296170f05df194c2073545200d968 rootlesskit-aarch64.tar.gz
f9faaf3b91e02764eb8308c7a7da7de55311de9fea665ca1b2632421b9286bcc rootlesskit-armv7l.tar.gz
fc1120af52071dc2a6984eec8dfc74f5d973fb28fa6c6d7ec77523a636ebf641 rootlesskit-ppc64le.tar.gz
acc1d39483df101bfa204c8dbf61d2e7ac85b246b3e9c606dabeaaeededd0130 rootlesskit-riscv64.tar.gz
9e1c29b1b82162a71d435edf80898adcb5a41c0ec51202c36856276689eb7b52 rootlesskit-s390x.tar.gz
5d402d7995f1e2c369240de3c6f8eb4cc2a3d1f0f4877ac5362044b2e83962e9 rootlesskit-x86_64.tar.gz