Use runc 1.0.0-rc92 in containerd 1.3+

containerd/containerd#5438
replicatedhq · Apr 30, 2021 · f4c7f2a · f4c7f2a
1 parent 60ae174
commit f4c7f2a
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 0 deletions.
diff --git a/addons/containerd/1.3.7/Manifest b/addons/containerd/1.3.7/Manifest
@@ -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
diff --git a/addons/containerd/1.3.7/install.sh b/addons/containerd/1.3.7/install.sh
@@ -6,6 +6,11 @@ function containerd_install() {
     if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
         install_host_archives "$src"
         install_host_packages "$src"
+        if [ ! -f ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc ] && [ "${AIRGAP}" != "1" ]; then
+            curl -sSL https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 > ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
+        fi
+        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

diff --git a/addons/containerd/1.3.9/Manifest b/addons/containerd/1.3.9/Manifest
@@ -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
diff --git a/addons/containerd/1.3.9/install.sh b/addons/containerd/1.3.9/install.sh
@@ -6,6 +6,11 @@ function containerd_install() {
     if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
         install_host_archives "$src"
         install_host_packages "$src"
+        if [ ! -f ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc ] && [ "${AIRGAP}" != "1" ]; then
+            curl -sSL https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 > ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
+        fi
+        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

diff --git a/addons/containerd/1.4.3/Manifest b/addons/containerd/1.4.3/Manifest
@@ -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
diff --git a/addons/containerd/1.4.3/install.sh b/addons/containerd/1.4.3/install.sh
@@ -6,6 +6,11 @@ function containerd_install() {
     if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
         install_host_archives "$src"
         install_host_packages "$src"
+        if [ ! -f ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc ] && [ "${AIRGAP}" != "1" ]; then
+            curl -sSL https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 > ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
+        fi
+        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

diff --git a/addons/containerd/1.4.4/Manifest b/addons/containerd/1.4.4/Manifest
@@ -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
diff --git a/addons/containerd/1.4.4/install.sh b/addons/containerd/1.4.4/install.sh
@@ -6,6 +6,11 @@ function containerd_install() {
     if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
         install_host_archives "$src"
         install_host_packages "$src"
+        if [ ! -f ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc ] && [ "${AIRGAP}" != "1" ]; then
+            curl -sSL https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 > ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
+        fi
+        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

diff --git a/addons/containerd/template/base/Manifest b/addons/containerd/template/base/Manifest
@@ -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
diff --git a/addons/containerd/template/base/install.sh b/addons/containerd/template/base/install.sh
@@ -6,6 +6,11 @@ function containerd_install() {
     if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then
         install_host_archives "$src"
         install_host_packages "$src"
+        if [ ! -f ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc ] && [ "${AIRGAP}" != "1" ]; then
+            curl -sSL https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 > ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
+        fi
+        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