Skip to content

Update linuxkit/init; Disable containerd CRI plugin #293

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

Merged
merged 4 commits into from
Aug 25, 2025
Merged

Update linuxkit/init; Disable containerd CRI plugin #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c854ba9
Update linuxkit/init to latest release:
jacobweinstock Aug 25, 2025
2c83d2b
Rename containerd config, disable cri plugin:
jacobweinstock Aug 25, 2025
5a61833
Fix container image build:
jacobweinstock Aug 25, 2025
665a907
Split out the containerd config files:
jacobweinstock Aug 25, 2025
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
2 changes: 1 addition & 1 deletion images/hook-containerd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion images/hook-containerd/etc/containerd/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
4 changes: 4 additions & 0 deletions images/hook-containerd/etc/containerd/runtime-config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion linuxkit-templates/hook.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading