kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
moby--moby/vendor
History
Sebastiaan van Stijn 2c97295ad8
daemon: remove v1 shim configuration for containerd 
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:
0b14c2b67a, 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>
2022-03-07 19:31:24 +01:00
..
cloud.google.com/go vendor: cloud.google.com/go v0.59.0 to remove some test-deps 2022-01-18 15:46:08 +01:00
code.cloudfoundry.org/clock
github.com daemon: remove v1 shim configuration for containerd 2022-03-07 19:31:24 +01:00
go.etcd.io/bbolt vendor: go.etcd.io/bbolt v1.3.6 2022-02-14 15:54:20 +01:00
go.opencensus.io vendor: regenerate 2022-01-18 15:46:04 +01:00
golang.org/x vendor: golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f 2022-03-01 18:03:34 +01:00
google.golang.org vendor: regenerate 2022-01-18 15:46:04 +01:00
gotest.tools/v3 vendor: gotest.tools/v3 v3.1.0 2022-03-01 17:02:53 +01:00
modules.txt daemon: remove v1 shim configuration for containerd 2022-03-07 19:31:24 +01:00