Skip to content

Commit f0b0027

Browse files
deitchdeitch
authored
Merge pull request linuxkit#3559 from deitch/containerd-opts
add support for containerd args
2 parents a1427d0 + eae1c24 commit f0b0027

File tree

107 files changed

+140
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+140
-106
lines changed

‎docs/faq.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,29 @@ If you're not seeing `containerd` logs in the console during boot, make sure tha
3737

3838
`init` and other processes like `containerd` will use the last defined console in the kernel `cmdline`. When using `qemu`, to see the console you need to list `ttyS0` as the last console to properly see the output.
3939

40+
## Enabling debug or trace log levels on containerd
41+
42+
On startup, linuxkit looks for and parses a file `/etc/containerd/cli-opts`. If it exists, the content is used as arguments to containerd. Thus, to enable
43+
a higher log level, for example `debug`, create a file whose contents are `--log-level debug` and place it on the image:
44+
45+
```yml
46+
files:
47+
- path: /etc/containerd/cli-opts
48+
contents: "--log-level debug"
49+
```
50+
51+
Note that the package that parses the contents splits on _all_ whitespace. It does not, as of this writing, support shell-like parsing, so the following will work:
52+
53+
```
54+
--log-level debug --arg abcd
55+
```
56+
57+
while the following will not:
58+
59+
```
60+
--log-level debug --arg 'abcd def'
61+
```
62+
4063
## Troubleshooting containers
4164

4265
Linuxkit runs all services in a specific `containerd` namespace called `services.linuxkit`. To list all the defined containers:

‎examples/addbinds.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kernel:
22
image: linuxkit/kernel:5.4.30
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
5-
- linuxkit/init:7195dc244cd92af01fd0895fd204249a6114c5e2
5+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
66
- linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878
77
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
88
- linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5

‎examples/aws.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kernel:
22
image: linuxkit/kernel:5.4.39
33
cmdline: "console=ttyS0"
44
init:
5-
- linuxkit/init:v0.8
5+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
66
- linuxkit/runc:v0.8
77
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
88
- linuxkit/ca-certificates:v0.8

‎examples/azure.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kernel:
22
image: linuxkit/kernel:5.4.39
33
cmdline: "console=ttyS0"
44
init:
5-
- linuxkit/init:v0.8
5+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
66
- linuxkit/runc:v0.8
77
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
88
- linuxkit/ca-certificates:v0.8

‎examples/cadvisor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kernel:
22
image: linuxkit/kernel:5.4.39
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
5-
- linuxkit/init:v0.8
5+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
66
- linuxkit/runc:v0.8
77
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
88
- linuxkit/ca-certificates:v0.8

‎examples/dm-crypt-loop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kernel:
22
image: linuxkit/kernel:5.4.39
33
cmdline: "console=tty0 console=ttyS0"
44
init:
5-
- linuxkit/init:v0.8
5+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
66
- linuxkit/runc:v0.8
77
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
88
- linuxkit/ca-certificates:v0.8

‎examples/dm-crypt.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kernel:
22
image: linuxkit/kernel:5.4.39
33
cmdline: "console=tty0 console=ttyS0"
44
init:
5-
- linuxkit/init:v0.8
5+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
66
- linuxkit/runc:v0.8
77
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
88
- linuxkit/ca-certificates:v0.8

‎examples/docker-for-mac.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kernel:
44
cmdline: "console=ttyS0 page_poison=1"
55
init:
66
- linuxkit/vpnkit-expose-port:v0.8 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
7-
- linuxkit/init:v0.8
7+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
88
- linuxkit/runc:v0.8
99
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
1010
- linuxkit/ca-certificates:v0.8

‎examples/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kernel:
22
image: linuxkit/kernel:5.4.39
33
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
44
init:
5-
- linuxkit/init:v0.8
5+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
66
- linuxkit/runc:v0.8
77
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
88
- linuxkit/ca-certificates:v0.8

‎examples/gcp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ kernel:
22
image: linuxkit/kernel:5.4.39
33
cmdline: "console=ttyS0"
44
init:
5-
- linuxkit/init:v0.8
5+
- linuxkit/init:9415d6bba5ca440e4f526b51c1d4cae51eefcdde
66
- linuxkit/runc:v0.8
77
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
88
- linuxkit/ca-certificates:v0.8

0 commit comments

Comments
 (0)