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

Use runc 1.0.0-rc92 in containerd 1.3+ #1549

Merged
merged 1 commit into from Apr 30, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/containerd/1.3.7/Manifest
Expand Up @@ -4,4 +4,5 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 1.3.7
dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.3.7
dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.3.7
yum libzstd
asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64
image pause k8s.gcr.io/pause:3.1
2 changes: 2 additions & 0 deletions addons/containerd/1.3.7/install.sh
Expand Up @@ -6,6 +6,8 @@ function containerd_install() {
if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
install_host_archives "$src"
install_host_packages "$src"
chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc)
containerd_configure
systemctl daemon-reload
fi
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.3.9/Manifest
Expand Up @@ -4,4 +4,5 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 1.3.9
dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.3.9
dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.3.9
yum libzstd
asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64
image pause k8s.gcr.io/pause:3.1
2 changes: 2 additions & 0 deletions addons/containerd/1.3.9/install.sh
Expand Up @@ -6,6 +6,8 @@ function containerd_install() {
if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
install_host_archives "$src"
install_host_packages "$src"
chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc)
containerd_configure
systemctl daemon-reload
fi
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.4.3/Manifest
Expand Up @@ -4,4 +4,5 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 1.4.3
dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.4.3
dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.4.3
yum libzstd
asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64
image pause k8s.gcr.io/pause:3.2
2 changes: 2 additions & 0 deletions addons/containerd/1.4.3/install.sh
Expand Up @@ -6,6 +6,8 @@ function containerd_install() {
if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
install_host_archives "$src"
install_host_packages "$src"
chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc)
containerd_configure
systemctl daemon-reload
fi
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/1.4.4/Manifest
Expand Up @@ -4,4 +4,5 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 1.4.4
dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.4.4
dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.4.4
yum libzstd
asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64
image pause k8s.gcr.io/pause:3.2
2 changes: 2 additions & 0 deletions addons/containerd/1.4.4/install.sh
Expand Up @@ -6,6 +6,8 @@ function containerd_install() {
if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
install_host_archives "$src"
install_host_packages "$src"
chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc)
containerd_configure
systemctl daemon-reload
fi
Expand Down
1 change: 1 addition & 0 deletions addons/containerd/template/base/Manifest
Expand Up @@ -4,3 +4,4 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 __version_
dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 __version__
dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 __version__
yum libzstd
asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64
2 changes: 2 additions & 0 deletions addons/containerd/template/base/install.sh
Expand Up @@ -6,6 +6,8 @@ function containerd_install() {
if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
install_host_archives "$src"
install_host_packages "$src"
chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc)
containerd_configure
systemctl daemon-reload
fi
Expand Down