Skip to content

Commit 6dbe8ea

Browse files
authored
Merge pull request #1307 from AntaresS/update-docs
update docs with the new features option in daemon.json
2 parents 022fd9b + 3e0b0a6 commit 6dbe8ea

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

docs/reference/commandline/dockerd.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,6 +1297,7 @@ This is a full example of the allowed configuration options on Linux:
12971297
"exec-opts": [],
12981298
"exec-root": "",
12991299
"experimental": false,
1300+
"features": {},
13001301
"storage-driver": "",
13011302
"storage-opts": [],
13021303
"labels": [],
@@ -1392,6 +1393,7 @@ This is a full example of the allowed configuration options on Windows:
13921393
"dns-search": [],
13931394
"exec-opts": [],
13941395
"experimental": false,
1396+
"features":{},
13951397
"storage-driver": "",
13961398
"storage-opts": [],
13971399
"labels": [],
@@ -1446,11 +1448,12 @@ The list of currently supported options that can be reconfigured is this:
14461448
the runtime shipped with the official docker packages.
14471449
- `runtimes`: it updates the list of available OCI runtimes that can
14481450
be used to run containers.
1449-
- `authorization-plugin`: specifies the authorization plugins to use.
1451+
- `authorization-plugin`: it specifies the authorization plugins to use.
14501452
- `allow-nondistributable-artifacts`: Replaces the set of registries to which the daemon will push nondistributable artifacts with a new set of registries.
14511453
- `insecure-registries`: it replaces the daemon insecure registries with a new set of insecure registries. If some existing insecure registries in daemon's configuration are not in newly reloaded insecure resgitries, these existing ones will be removed from daemon's config.
14521454
- `registry-mirrors`: it replaces the daemon registry mirrors with a new set of registry mirrors. If some existing registry mirrors in daemon's configuration are not in newly reloaded registry mirrors, these existing ones will be removed from daemon's config.
14531455
- `shutdown-timeout`: it replaces the daemon's existing configuration timeout with a new timeout for shutting down all containers.
1456+
- `features`: it explicitly enables or disables specific features.
14541457

14551458
Updating and reloading the cluster configurations such as `--cluster-store`,
14561459
`--cluster-advertise` and `--cluster-store-opts` will take effect only if

0 commit comments

Comments
 (0)