1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/libcontainerd/supervisor
Sebastiaan van Stijn 2a7c1cc1d6
libcontainerd/supervisor: replace BurntSushi/toml with pelletier/go-toml
Taking the same approach as was taken in containerd

The new library has a slightly different output;

- keys at the same level are sorted alphabetically
- empty sections not omitted (`proxy_plugins`, `stream_processors`, `timeouts`),
  which could possibly be be addressed with an "omitempty" in containerd's struct.
- empty slices are not omitted (`imports`, `required_plugins`)

After sorting the "before" configuration the diff looks like this:

```patch
diff --git a/config-before-sorted.toml b/config-after.toml
index cc771ce7ab..43a727f589 100644
--- a/config-before-sorted.toml
+++ b/config-after.toml
@@ -1,6 +1,8 @@
 disabled_plugins = ["cri"]
+imports = []
 oom_score = 0
 plugin_dir = ""
+required_plugins = []
 root = "/var/lib/docker/containerd/daemon"
 state = "/var/run/docker/containerd/daemon"
 version = 0
@@ -37,6 +39,12 @@ version = 0
     shim = "containerd-shim"
     shim_debug = true

+[proxy_plugins]
+
+[stream_processors]
+
+[timeouts]
+
 [ttrpc]
   address = ""
   gid = 0
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-02 17:42:57 +02:00
..
remote_daemon.go libcontainerd/supervisor: replace BurntSushi/toml with pelletier/go-toml 2021-04-02 17:42:57 +02:00
remote_daemon_linux.go libcontainerd/supervisor: replace BurntSushi/toml with pelletier/go-toml 2021-04-02 17:42:57 +02:00
remote_daemon_options.go libcontainerd/supervisor: replace BurntSushi/toml with pelletier/go-toml 2021-04-02 17:42:57 +02:00
remote_daemon_options_linux.go
remote_daemon_windows.go Remove 'docker-' prefix for containerd and runc binaries 2018-09-24 21:49:03 +00:00
utils_linux.go
utils_windows.go