daemon: remove v1 shim configuration for containerd#41675
Merged
thaJeztah merged 1 commit intoMar 8, 2022
moby:mastermoby/moby:masterfrom
thaJeztah:remove_containerd_plugin_configthaJeztah/docker:remove_containerd_plugin_configCopy head branch name to clipboard
Merged
daemon: remove v1 shim configuration for containerd#41675thaJeztah merged 1 commit intomoby:mastermoby/moby:masterfrom thaJeztah:remove_containerd_plugin_configthaJeztah/docker:remove_containerd_plugin_configCopy head branch name to clipboard
thaJeztah merged 1 commit into
moby:mastermoby/moby:masterfrom
thaJeztah:remove_containerd_plugin_configthaJeztah/docker:remove_containerd_plugin_configCopy head branch name to clipboard
Conversation
Member
Author
|
@AkihiroSuda @cpuguy83 @tonistiigi PTAL; IIUC, this configuration was not used at all. I'm slightly confused though why the |
AkihiroSuda
approved these changes
Nov 16, 2020
thaJeztah
force-pushed
the
remove_containerd_plugin_config
branch
from
November 30, 2020 11:46
f43b2d6 to
a823621
Compare
Member
Author
|
@cpuguy83 @tonistiigi PTAL |
thaJeztah
force-pushed
the
remove_containerd_plugin_config
branch
from
December 3, 2020 15:05
a823621 to
b387735
Compare
Member
Author
|
Rebased |
thaJeztah
force-pushed
the
remove_containerd_plugin_config
branch
from
June 8, 2021 08:08
b387735 to
9ecf645
Compare
Member
Author
|
rebased |
thaJeztah
force-pushed
the
remove_containerd_plugin_config
branch
from
July 10, 2021 12:59
9ecf645 to
a78ae04
Compare
Member
Author
|
Rebased to get a fresh run of CI Is this one Good to go? (Anything we need to mention in the documentation?) |
This removes the plugin section from the containerd configuration file
(`/var/run/docker/containerd/containerd.toml`) that is generated when
starting containerd as child process;
```toml
[plugins]
[plugins.linux]
shim = "containerd-shim"
runtime = "runc"
runtime_root = "/var/lib/docker/runc"
no_shim = false
shim_debug = true
```
This configuration doesn't appear to be used since commit:
0b14c2b, which switched the default runtime
to to io.containerd.runc.v2.
Note that containerd itself uses `containerd-shim` and `runc` as default
for `shim` and `runtime` v1, so omitting that configuration doesn't seem
to make a difference.
I'm slightly confused if any of the other options in this configuration were
actually used: for example, even though `runtime_root` was configured to be
`/var/lib/docker/runc`, when starting a container with that coniguration set
on docker 19.03, `/var/lib/docker/runc` doesn't appear to exist:
```console
$ docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
098baa4cb0e7 nginx:alpine "/docker-entrypoint.…" 59 minutes ago Up 59 minutes 80/tcp foo
$ ls /var/lib/docker/runc
ls: /var/lib/docker/runc: No such file or directory
$ ps auxf
PID USER TIME COMMAND
1 root 0:00 sh
16 root 0:11 dockerd --debug
26 root 0:09 containerd --config /var/run/docker/containerd/containerd.toml --log-level debug
234 root 0:00 containerd-shim -namespace moby -workdir /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/09
251 root 0:00 nginx: master process nginx -g daemon off;
304 101 0:00 nginx: worker process
...
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
remove_containerd_plugin_config
branch
from
March 7, 2022 18:31
a78ae04 to
2c97295
Compare
AkihiroSuda
approved these changes
Mar 8, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
relates to #41656 (specifically #41656 (comment))
This removes the plugin section from the containerd configuration file (
/var/run/docker/containerd/containerd.toml) that is generated when starting containerd as child process;This configuration doesn't appear to be used since commit: 0b14c2b (#41210), which switched the default runtime to to io.containerd.runc.v2.
Note that containerd itself uses
containerd-shimandruncas default forshimandruntimev1, so omitting that configuration doesn't seem to make a difference.I'm slightly confused if any of the other options in this configuration were actually used: for example, even though
runtime_rootwas configured to be/var/lib/docker/runc, when starting a container with that coniguration set on docker 19.03,/var/lib/docker/runcdoesn't appear to exist:- Description for the changelog