Browse code

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 authored on 2016/06/17 13:41:58
Showing 1 changed files
... ...
@@ -986,19 +986,23 @@ the `--cgroup-parent` option on the daemon.
986 986
 The `--config-file` option allows you to set any configuration option
987 987
 for the daemon in a JSON format. This file uses the same flag names as keys,
988 988
 except for flags that allow several entries, where it uses the plural
989
-of the flag name, e.g., `labels` for the `label` flag. By default,
990
-docker tries to load a configuration file from `/etc/docker/daemon.json`
991
-on Linux and `%programdata%\docker\config\daemon.json` on Windows.
989
+of the flag name, e.g., `labels` for the `label` flag.
992 990
 
993 991
 The options set in the configuration file must not conflict with options set
994 992
 via flags. The docker daemon fails to start if an option is duplicated between
995 993
 the file and the flags, regardless their value. We do this to avoid
996 994
 silently ignore changes introduced in configuration reloads.
997 995
 For example, the daemon fails to start if you set daemon labels
998
-in the configuration file and also set daemon labels via the `--label` flag.
999
-
996
+in the configuration file and also set daemon labels via the `--label` flag. 
1000 997
 Options that are not present in the file are ignored when the daemon starts.
1001
-This is a full example of the allowed configuration options in the file:
998
+
999
+### Linux configuration file
1000
+
1001
+The default location of the configuration file on Linux is 
1002
+`/etc/docker/daemon.json`. The `--config-file` flag can be used to specify a
1003
+ non-default location. 
1004
+
1005
+This is a full example of the allowed configuration options on Linux:
1002 1006
 
1003 1007
 ```json
1004 1008
 {
... ...
@@ -1067,6 +1071,48 @@ This is a full example of the allowed configuration options in the file:
1067 1067
 }
1068 1068
 ```
1069 1069
 
1070
+### Windows configuration file
1071
+
1072
+The default location of the configuration file on Windows is
1073
+ `%programdata%\docker\config\daemon.json`. The `--config-file` flag can be
1074
+ used to specify a non-default location. 
1075
+
1076
+This is a full example of the allowed configuration options on Windows:
1077
+
1078
+```json
1079
+{
1080
+    "authorization-plugins": [],
1081
+    "dns": [],
1082
+    "dns-opts": [],
1083
+    "dns-search": [],
1084
+    "exec-opts": [],
1085
+    "storage-driver": "",
1086
+    "storage-opts": [],
1087
+    "labels": [],
1088
+    "log-driver": "", 
1089
+    "mtu": 0,
1090
+    "pidfile": "",
1091
+    "graph": "",
1092
+    "cluster-store": "",
1093
+    "cluster-advertise": "",
1094
+    "debug": true,
1095
+    "hosts": [],
1096
+    "log-level": "",
1097
+    "tlsverify": true,
1098
+    "tlscacert": "",
1099
+    "tlscert": "",
1100
+    "tlskey": "",
1101
+    "group": "",
1102
+    "default-ulimits": {},
1103
+    "bridge": "",
1104
+    "fixed-cidr": "",
1105
+    "raw-logs": false,
1106
+    "registry-mirrors": [],
1107
+    "insecure-registries": [],
1108
+    "disable-legacy-registry": false
1109
+}
1110
+```
1111
+
1070 1112
 ### Configuration reloading
1071 1113
 
1072 1114
 Some options can be reconfigured when the daemon is running without requiring