瀏覽代碼

Added daemon.json Windows example

Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
(cherry picked from commit 8352089e8c78cdf71ac9eec0c125a35f9bf36ebc)
Signed-off-by: Tibor Vass <tibor@docker.com>
Neil Peterson 9 年之前
父節點
當前提交
de6b73a1a8
共有 1 個文件被更改,包括 52 次插入6 次删除
  1. 52 6
      docs/reference/commandline/dockerd.md

+ 52 - 6
docs/reference/commandline/dockerd.md

@@ -986,19 +986,23 @@ the `--cgroup-parent` option on the daemon.
 The `--config-file` option allows you to set any configuration option
 The `--config-file` option allows you to set any configuration option
 for the daemon in a JSON format. This file uses the same flag names as keys,
 for the daemon in a JSON format. This file uses the same flag names as keys,
 except for flags that allow several entries, where it uses the plural
 except for flags that allow several entries, where it uses the plural
-of the flag name, e.g., `labels` for the `label` flag. By default,
-docker tries to load a configuration file from `/etc/docker/daemon.json`
-on Linux and `%programdata%\docker\config\daemon.json` on Windows.
+of the flag name, e.g., `labels` for the `label` flag.
 
 
 The options set in the configuration file must not conflict with options set
 The options set in the configuration file must not conflict with options set
 via flags. The docker daemon fails to start if an option is duplicated between
 via flags. The docker daemon fails to start if an option is duplicated between
 the file and the flags, regardless their value. We do this to avoid
 the file and the flags, regardless their value. We do this to avoid
 silently ignore changes introduced in configuration reloads.
 silently ignore changes introduced in configuration reloads.
 For example, the daemon fails to start if you set daemon labels
 For example, the daemon fails to start if you set daemon labels
-in the configuration file and also set daemon labels via the `--label` flag.
-
+in the configuration file and also set daemon labels via the `--label` flag. 
 Options that are not present in the file are ignored when the daemon starts.
 Options that are not present in the file are ignored when the daemon starts.
-This is a full example of the allowed configuration options in the file:
+
+### Linux configuration file
+
+The default location of the configuration file on Linux is 
+`/etc/docker/daemon.json`. The `--config-file` flag can be used to specify a
+ non-default location. 
+
+This is a full example of the allowed configuration options on Linux:
 
 
 ```json
 ```json
 {
 {
@@ -1067,6 +1071,48 @@ This is a full example of the allowed configuration options in the file:
 }
 }
 ```
 ```
 
 
+### Windows configuration file
+
+The default location of the configuration file on Windows is
+ `%programdata%\docker\config\daemon.json`. The `--config-file` flag can be
+ used to specify a non-default location. 
+
+This is a full example of the allowed configuration options on Windows:
+
+```json
+{
+    "authorization-plugins": [],
+    "dns": [],
+    "dns-opts": [],
+    "dns-search": [],
+    "exec-opts": [],
+    "storage-driver": "",
+    "storage-opts": [],
+    "labels": [],
+    "log-driver": "", 
+    "mtu": 0,
+    "pidfile": "",
+    "graph": "",
+    "cluster-store": "",
+    "cluster-advertise": "",
+    "debug": true,
+    "hosts": [],
+    "log-level": "",
+    "tlsverify": true,
+    "tlscacert": "",
+    "tlscert": "",
+    "tlskey": "",
+    "group": "",
+    "default-ulimits": {},
+    "bridge": "",
+    "fixed-cidr": "",
+    "raw-logs": false,
+    "registry-mirrors": [],
+    "insecure-registries": [],
+    "disable-legacy-registry": false
+}
+```
+
 ### Configuration reloading
 ### Configuration reloading
 
 
 Some options can be reconfigured when the daemon is running without requiring
 Some options can be reconfigured when the daemon is running without requiring