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

update containerd (1.7.1), CNI plugins (1.3.0), BuildKit (0.11.6), Kubo (0.20.0), containerd-fuse-overlayfs (1.0.6), fuse-overlayfs (1.1.2) #2228

Merged
merged 8 commits into from
May 12, 2023
Merged

update containerd (1.7.1), CNI plugins (1.3.0), BuildKit (0.11.6), Kubo (0.20.0), containerd-fuse-overlayfs (1.0.6), fuse-overlayfs (1.1.2) #2228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0eb5292
update containerd (1.7.1)
AkihiroSuda May 11, 2023
143ad39
update CNI plugins (1.3.0)
AkihiroSuda May 11, 2023
169a4d8
update BuildKit (0.11.6)
AkihiroSuda May 11, 2023
87abde3
update Nydus (2.2.1)
AkihiroSuda May 11, 2023
a9af12b
update Kubo (0.20.0)
AkihiroSuda May 11, 2023
406070b
update gotestsum (1.10.0)
AkihiroSuda May 11, 2023
3e4302c
update containerd-fuse-overlayfs (1.0.6)
AkihiroSuda May 11, 2023
68ddcd2
update fuse-overlayfs (1.12)
AkihiroSuda May 11, 2023
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
19 changes: 9 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@
# TODO: verify commit hash

# Basic deps
ARG CONTAINERD_VERSION=v1.7.0
ARG CONTAINERD_VERSION=v1.7.1
ARG RUNC_VERSION=v1.1.5
ARG CNI_PLUGINS_VERSION=v1.2.0
ARG CNI_PLUGINS_VERSION=v1.3.0

# Extra deps: Build
ARG BUILDKIT_VERSION=v0.11.5
ARG BUILDKIT_VERSION=v0.11.6
# Extra deps: Lazy-pulling
ARG STARGZ_SNAPSHOTTER_VERSION=v0.14.3
# Extra deps: Nydus Lazy-pulling
ARG NYDUS_VERSION=v2.2.0
# Extra deps: Encryption
ARG IMGCRYPT_VERSION=v1.1.7
# Extra deps: Rootless
Expand All @@ -36,10 +34,10 @@ ARG SLIRP4NETNS_VERSION=v1.2.0
# Extra deps: bypass4netns
ARG BYPASS4NETNS_VERSION=v0.3.0
# Extra deps: FUSE-OverlayFS
ARG FUSE_OVERLAYFS_VERSION=v1.11
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.5
ARG FUSE_OVERLAYFS_VERSION=v1.12
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.6
# Extra deps: IPFS
ARG KUBO_VERSION=v0.19.1
ARG KUBO_VERSION=v0.20.0
# Extra deps: Init
ARG TINI_VERSION=v0.19.0
# Extra deps: Debug
Expand All @@ -49,7 +47,8 @@ ARG BUILDG_VERSION=v0.4.1
ARG GO_VERSION=1.20
ARG UBUNTU_VERSION=22.04
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
ARG GOTESTSUM_VERSION=v1.9.0
ARG GOTESTSUM_VERSION=v1.10.0
ARG NYDUS_VERSION=v2.2.1

FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.2.1 AS xx

Expand Down Expand Up @@ -221,7 +220,7 @@ RUN fname="buildg-${BUILDG_VERSION}-${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.
RUN echo "" >> /out/share/doc/nerdctl-full/README.md && \
echo "## License" >> /out/share/doc/nerdctl-full/README.md && \
echo "- bin/slirp4netns: [GNU GENERAL PUBLIC LICENSE, Version 2](https://github.com/rootless-containers/slirp4netns/blob/${SLIRP4NETNS_VERSION}/COPYING)" >> /out/share/doc/nerdctl-full/README.md && \
echo "- bin/fuse-overlayfs: [GNU GENERAL PUBLIC LICENSE, Version 3](https://github.com/containers/fuse-overlayfs/blob/${FUSE_OVERLAYFS_VERSION}/COPYING)" >> /out/share/doc/nerdctl-full/README.md && \
echo "- bin/fuse-overlayfs: [GNU GENERAL PUBLIC LICENSE, Version 2](https://github.com/containers/fuse-overlayfs/blob/${FUSE_OVERLAYFS_VERSION}/COPYING)" >> /out/share/doc/nerdctl-full/README.md && \
echo "- bin/ipfs: [Combination of MIT-only license and dual MIT/Apache-2.0 license](https://github.com/ipfs/kubo/blob/${KUBO_VERSION}/LICENSE)" >> /out/share/doc/nerdctl-full/README.md && \
echo "- bin/{runc,bypass4netns,bypass4netnsd}: Apache License 2.0, statically linked with libseccomp ([LGPL 2.1](https://github.com/seccomp/libseccomp/blob/main/LICENSE), source code available at https://github.com/seccomp/libseccomp/)" >> /out/share/doc/nerdctl-full/README.md && \
echo "- bin/tini: [MIT License](https://github.com/krallin/tini/blob/${TINI_VERSION}/LICENSE)" >> /out/share/doc/nerdctl-full/README.md && \
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.5
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
3f66f5bfbe509aadf1c21a26acfa472fe4c19046aa00a2d59b99733da867cd76 buildkit-v0.11.6.linux-amd64.tar.gz
82b7452ffea166d3ef445597f9dbe3fa57c4d651e51ca7a9a581199116905524 buildkit-v0.11.6.linux-arm64.tar.gz
2 changes: 0 additions & 2 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.2.0
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.3.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
754a71ed60a4bd08726c3af705a7d55ee3df03122b12e389fdba4bea35d7dd7e cni-plugins-linux-amd64-v1.3.0.tgz
de7a666fd6ad83a228086bd55756db62ef335a193d1b143d910b69f079e30598 cni-plugins-linux-arm64-v1.3.0.tgz
6 changes: 0 additions & 6 deletions Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.5
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
2fbf5532021a558a965358e765c21b4dbe891e00ac68d18ab088d3cea4a41613 containerd-fuse-overlayfs-1.0.6-linux-amd64.tar.gz
9d983f341b7fb980bb7728851aaab41f706cbc55387940800fabcd7f01b33f24 containerd-fuse-overlayfs-1.0.6-linux-arm-v7.tar.gz
27c40aea2dc37fc59dae790c87193190a8360a310fa8df16fcbec165a46d6163 containerd-fuse-overlayfs-1.0.6-linux-arm64.tar.gz
ad92ee6c7ecbf7b1f2b78f13eccf5ca82fc5349ef93d9116bef49b6767fbc146 containerd-fuse-overlayfs-1.0.6-linux-ppc64le.tar.gz
971243ff3da618dbdcc28ef243ed08e834f7acfc164feebd7d25502938d5cae8 containerd-fuse-overlayfs-1.0.6-linux-riscv64.tar.gz
691c07478f009858cbba66300a0da689fe60daf7fbc13609759ff8ef14ac2a97 containerd-fuse-overlayfs-1.0.6-linux-s390x.tar.gz
6 changes: 0 additions & 6 deletions Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.11
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.12
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
6d2813904de47350adf6d61998c97d5c262fc01b4cf4a0b70be21097aa2acda4 fuse-overlayfs-aarch64
357763baab2e4cfd7de07e0683252d5ea0dde5e5c7bd8aba99662e25f5e63329 fuse-overlayfs-armv7l
5b781adc8861f095719a3d61d936621f8a17bf68cc78c73c0e693dafb679831f fuse-overlayfs-ppc64le
8b147b181c068c858bb8e8c4966817f3f884d9aad6ee7860f2a46e82c70d02ba fuse-overlayfs-riscv64
e3fabc7529071e490b0a5e4848feaf3a0d984b50ebe84f0c4e4686503e1d5f07 fuse-overlayfs-s390x
152318f61b1fbe91ddaef42ed31f4a173d288af1376484bc54aff892c53f4a90 fuse-overlayfs-x86_64
3 changes: 0 additions & 3 deletions Dockerfile.d/SHA256SUMS.d/kubo-v0.19.1
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/kubo-v0.20.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# From https://github.com/ipfs/kubo/releases
46f3f14d75640dfedb0ee79ccb87eefa30da5c00b0af2c30f02f13454f5ab072 kubo_v0.20.0_linux-amd64.tar.gz
a073d4e9eefd5f7c1ee24f2c9d0a8975591beea34c49d8fee4c0ea731393ef84 kubo_v0.20.0_linux-arm64.tar.gz