Skip to content

Commit

Permalink
Merge pull request #3646 from AkihiroSuda/dev
Browse files Browse the repository at this point in the history
update containerd (2.0.0), runc (1.2.1), BuildKit (0.17.0), etc.
  • Loading branch information
AkihiroSuda authored Nov 6, 2024
2 parents b9e9d0a + 7103b54 commit ef588da
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 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.23
arch: amd64
- runner: ubuntu-24.04
containerd: v2.0.0-rc.5
containerd: v2.0.0
arch: amd64
- runner: arm64-8core-32gb
containerd: v2.0.0-rc.5
containerd: v2.0.0
arch: arm64
env:
CONTAINERD_VERSION: "${{ matrix.containerd }}"
Expand Down Expand Up @@ -114,11 +114,11 @@ jobs:
runner: "ubuntu-22.04"
arch: amd64
- ubuntu: 24.04
containerd: v2.0.0-rc.5
containerd: v2.0.0
runner: "ubuntu-24.04"
arch: amd64
- ubuntu: 24.04
containerd: v2.0.0-rc.5
containerd: v2.0.0
runner: arm64-8core-32gb
arch: arm64
env:
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
matrix:
include:
- ubuntu: 24.04
containerd: v2.0.0-rc.5
containerd: v2.0.0
arch: amd64
env:
CONTAINERD_VERSION: "${{ matrix.containerd }}"
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
target: rootless
arch: amd64
- ubuntu: 24.04
containerd: v2.0.0-rc.5
containerd: v2.0.0
rootlesskit: v2.3.1
target: rootless
arch: amd64
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
# TODO: verify commit hash

# Basic deps
ARG CONTAINERD_VERSION=v2.0.0-rc.6
ARG RUNC_VERSION=v1.2.0
ARG CONTAINERD_VERSION=v2.0.0
ARG RUNC_VERSION=v1.2.1
ARG CNI_PLUGINS_VERSION=v1.6.0

# Extra deps: Build
ARG BUILDKIT_VERSION=v0.16.0
ARG BUILDKIT_VERSION=v0.17.0
# Extra deps: Lazy-pulling
ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
# Extra deps: Encryption
Expand All @@ -35,7 +35,7 @@ ARG SLIRP4NETNS_VERSION=v1.3.1
ARG BYPASS4NETNS_VERSION=v0.4.1
# Extra deps: FUSE-OverlayFS
ARG FUSE_OVERLAYFS_VERSION=v1.14
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.0.0
# Extra deps: Init
ARG TINI_VERSION=v0.19.0
# Extra deps: Debug
Expand All @@ -47,7 +47,7 @@ ARG UBUNTU_VERSION=24.04
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
ARG GOTESTSUM_VERSION=v1.12.0
ARG NYDUS_VERSION=v2.3.0
ARG SOCI_SNAPSHOTTER_VERSION=0.7.0
ARG SOCI_SNAPSHOTTER_VERSION=0.8.0
ARG KUBO_VERSION=v0.31.0

FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.5.0 AS xx
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/buildkit-v0.16.0

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/buildkit-v0.17.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
3a9fea5977df76e9008fa5fb3d9b5dd581729e8adced2180a45bd3c12a4d1331 buildkit-v0.17.0.linux-amd64.tar.gz
5ec19fe78eeef2c03bef216d6890f05901fc117e7a66f88b423268dfcf5cf4af buildkit-v0.17.0.linux-arm64.tar.gz
6 changes: 0 additions & 6 deletions Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.8

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.0.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dc20341234be8fa44e1308c9f38e30d7239c12350a046c83f4d1c804b682fe6c containerd-fuse-overlayfs-2.0.0-linux-amd64.tar.gz
acfaa3a2caa6316b2c409bcb1c2600b6faee504188c412df8261024435dbfefc containerd-fuse-overlayfs-2.0.0-linux-arm-v7.tar.gz
8b8032a4e0d16aedf7797818944147cebefad32e6657e0b7089501bcfc732e57 containerd-fuse-overlayfs-2.0.0-linux-arm64.tar.gz
b4603139b2a532ac9ed8df3197669d3df5dfd9bebda2aa5f507ad6e6dbb1ed77 containerd-fuse-overlayfs-2.0.0-linux-ppc64le.tar.gz
9e169b401e063cfb0b7b192f911dcb2532ec86a64844d8c052e076fe692017c3 containerd-fuse-overlayfs-2.0.0-linux-riscv64.tar.gz
e8dfe8e2aff5b32f2f5698909baadd0cb36aa85704ff8c568f6bcae186e0ccc5 containerd-fuse-overlayfs-2.0.0-linux-s390x.tar.gz

0 comments on commit ef588da

Please sign in to comment.