diff --git a/images/hook-containerd/Dockerfile b/images/hook-containerd/Dockerfile index 38447c71..c6f9c5e5 100644 --- a/images/hook-containerd/Dockerfile +++ b/images/hook-containerd/Dockerfile @@ -10,7 +10,7 @@ ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_COMMIT=v2.1.3 ENV NERDCTL_VERSION=2.1.2 ENV GOPATH=/go -RUN apk add go=1.24.4-r0 git +RUN apk add go=1.24.6-r0 git RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/images/hook-containerd/etc/containerd/config.toml b/images/hook-containerd/etc/containerd/config.toml index e76a9b97..72ba9b8f 100644 --- a/images/hook-containerd/etc/containerd/config.toml +++ b/images/hook-containerd/etc/containerd/config.toml @@ -3,7 +3,7 @@ version = 3 root = '/var/lib/containerd' state = '/run/containerd' temp = '' -disabled_plugins = [] +disabled_plugins = ["io.containerd.grpc.v1.cri","io.containerd.internal.v1.opt"] required_plugins = [] oom_score = 0 imports = [] diff --git a/images/hook-containerd/etc/containerd/runtime-config.toml b/images/hook-containerd/etc/containerd/runtime-config.toml new file mode 100644 index 00000000..74d4b1f2 --- /dev/null +++ b/images/hook-containerd/etc/containerd/runtime-config.toml @@ -0,0 +1,4 @@ +# This file is used by linuxkit/init to configure the start up of containerd +# https://github.com/linuxkit/linuxkit/blob/master/pkg/init/cmd/service/system_init.go +stdout = "/var/log/containerd.out.log" +stderr = "/var/log/containerd.err.log" \ No newline at end of file diff --git a/linuxkit-templates/hook.template.yaml b/linuxkit-templates/hook.template.yaml index 6d88398c..ae676f65 100644 --- a/linuxkit-templates/hook.template.yaml +++ b/linuxkit-templates/hook.template.yaml @@ -20,7 +20,7 @@ kernel: init: # this init container sha has support for volumes - - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/init:v1.1.0 - "${HOOK_CONTAINER_RUNC_IMAGE}" - "${HOOK_CONTAINER_CONTAINERD_IMAGE}" - linuxkit/ca-certificates:v1.0.0