L-Hudson
3948dcc901
Merge pull request #8253 from russellballestrini/patch-2
...
Create local.md
2019-03-01 08:32:16 -05:00
Paige Hargrave
4b5fbbdbc9
Revert "Merge branch 'master' of github.com:docker/docker.github.io"
...
This reverts commit 813f45bdd7 , reversing
changes made to 2349c62566 .
2019-02-28 13:11:13 -05:00
L-Hudson
3367a96037
Merge pull request #8207 from toph/log-json-file-example-format
...
Add an example json-file log line to the documentation.
2019-02-25 08:46:46 -05:00
ion9
fd9efc9096
update to include the \. from %L
...
in the code you must have a ```.``` at the start of your %L, this change calls that out in the doc
2019-02-20 11:49:39 -05:00
L-Hudson
fc53dce7f8
Merge pull request #8254 from russellballestrini/patch-1
...
Add a reference to the `local` log-driver
2019-02-20 09:59:41 -05:00
Marcel Hoyer
9c929506a3
Improve `fluentd-async-connect` option
...
- According to c093c1e08b/daemon/logger/fluentd/fluentd.go (L114) I added the _Defaults to `false`._ statement to `fluentd-async-connect` option.
- Add inline code formatting for other default values
2019-02-18 17:30:55 +01:00
Russell Ballestrini
46c2ef22ab
Update local.md
2019-02-14 14:56:40 -08:00
Russell Ballestrini
e50e4c09db
Create local.md
2019-02-14 14:55:26 -08:00
Russell Ballestrini
fd088cd56f
Add a reference to the `local` log-driver
2019-02-14 14:31:49 -08:00
paigehargrave
d41dd938d0
Merge pull request #8217 from ryujisnote/ryujisnote-noproxy-nocidr-1
...
NO_PROXY does not support CIDR notation.
2019-02-12 16:27:03 -05:00
paigehargrave
745168800a
Merge pull request #6933 from meshde/master
...
Clear confusion in the restart policies
2019-02-12 16:05:44 -05:00
Topher Cyll
1ef9a7e4d5
Add an example json-file log line to the documentation.
2019-02-09 13:25:41 -05:00
alex seubert
6d7fd0e2ec
Use correct `log-driver` key in daemon.json
2019-02-08 17:07:20 -06:00
Ryuji Coffee
bec34a4a6e
Update systemd.md
...
NO_PROXY does not support CIDR notation. #8191
2019-02-08 17:10:47 +09:00
L-Hudson
9c4de0b3ce
Merge pull request #8061 from ChaosGramer/patch-1
...
Adding proxy wildcard documentation
2019-01-28 12:55:49 -05:00
Jan Vaehsen (Windows)
9edcd49141
resolve suggestion conflict
2019-01-25 15:17:28 +01:00
Sebastiaan van Stijn
71e41e3d95
Update config/daemon/systemd.md
...
Co-Authored-By: ChaosGramer <ChaosGramer@users.noreply.github.com>
2019-01-25 14:44:20 +01:00
Sebastiaan van Stijn
46f76f241e
Update config/daemon/systemd.md
...
Co-Authored-By: ChaosGramer <ChaosGramer@users.noreply.github.com>
2019-01-25 14:44:13 +01:00
Sebastiaan van Stijn
d38627d05a
Update config/daemon/systemd.md
...
Co-Authored-By: ChaosGramer <ChaosGramer@users.noreply.github.com>
2019-01-25 14:43:49 +01:00
Jan Vaehsen (Windows)
61be95d7f6
add documentation for NO_PROXY var in systemd config
2019-01-25 13:10:06 +01:00
ChaosGramer
f3960c3d31
Adding proxy wildcard documentation
...
Wildcard documentation was missing in the official docs
2019-01-22 11:55:03 +01:00
paigehargrave
456b878b32
Update start-containers-automatically.md
2019-01-19 07:38:04 -05:00
justin
fbafb4915e
multi-service containers
...
one solution for spawning helper processes that interact with a
primary process before ultimately putting the primary process
back in the foreground
2019-01-18 16:15:26 -05:00
Maria Bermudez
385708f221
remove outdated ambassador pattern #7845
2019-01-17 11:23:12 -08:00
Trapier Marshall
cb44c59f5a
daemon: windows stack indicate pid retrieval
...
lifted from https://docs.microsoft.com/en-us/virtualization/windowscontainers/troubleshooting#obtaining-stack-dump
2019-01-16 15:41:01 -05:00
paigehargrave
0dab4ade68
Merge branch 'master' into name-change-for-Docker-Desktop
2019-01-14 11:14:48 -05:00
paigehargrave
a887def492
Update index.md
2019-01-11 15:04:49 -05:00
paigehargrave
eb6f2d9e56
Update prometheus.md
2019-01-11 13:34:18 -05:00
paigehargrave
62edcf746d
Update live-restore.md
2019-01-11 13:20:06 -05:00
paigehargrave
20f3c6b145
Merge pull request #7344 from stefjoosten/patch-1
...
Update index.md
2019-01-07 12:55:10 -05:00
L-Hudson
f9bbe4fc3f
Merge pull request #6989 from dintort/patch-1
...
Updated gelf.md invalid dash
2019-01-02 19:40:31 -05:00
Anne Henmi
0ede8278d2
Merge pull request #7670 from SimonHeimberg/patch-1
...
Show hint how to find out what data can be printed
2018-12-26 09:51:01 -07:00
Anne Henmi
643954e77e
Update formatting.md
2018-12-26 09:50:25 -07:00
opsxcq
677853d3b0
Fixed example
...
Argument `--it` doesn't exist, the correct way to run the example is with `-it`
2018-12-22 13:34:23 +00:00
Anne Henmi
7790911368
Update configure.md
2018-12-19 15:25:25 -07:00
Anne Henmi
d3bebc2b6f
Revert "Update configure.md"
...
This reverts commit 3a6dcf3323 .
2018-12-19 15:23:59 -07:00
Anne Henmi
3a6dcf3323
Update configure.md
2018-12-19 15:22:08 -07:00
Maria Bermudez
f96ef308bb
Merge pull request #7726 from shagohead/patch-1
...
fixed small typo in runmetrics.md
2018-12-13 10:39:52 -08:00
Maria Bermudez
4bdcbf8ae9
Merge branch 'master' of github.com:docker/docker.github.io
2018-12-10 12:41:24 -08:00
Jeffrey Morgan
f6bbf912db
Typo fixes
2018-12-03 22:30:33 -05:00
Sebastiaan van Stijn
a967b6ccc9
Add note about log-opt options in daemon.json taking string values only
...
log-opts are passed to logging-drivers as-is, so the daemon is not
aware what value-type each option takes.
For this reason, all options must be provided as a string, even if
they are used as numeric values by the logging driver.
For example, to pass the "max-file" option to the default (json-file)
logging driver, this value has to be passed as a string;
```json
{
"log-driver": "json-file",
"log-opts": {
"max-size": "10m",
"max-file": "3"
}
}
```
When passed as a _number_ (`"max-file": 3`), the daemon will invalidate
the configuration file, and fail to start;
unable to configure the Docker daemon with file /etc/docker/daemon.json: json: cannot unmarshal number into Go value of type string
This patch adds an example to the daemon.json to show these values
have to be passed as strings.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-21 14:55:36 +01:00
Sebastiaan van Stijn
472eafd45e
Fix formatting of option-table in syslog driver
...
Part of the format description was accidentally aligned
with the "example value" column.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-21 14:41:53 +01:00
Sebastiaan van Stijn
aa77505b67
Use --format to get active logging driver
...
This approach works on all platforms, and reduces the dependency
on external tools (`grep` in this case).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-21 14:00:09 +01:00
Sebastiaan van Stijn
8f36e28ad5
Remove note about Docker 17.05
...
Docker Engine 17.05 has reached EOL, so all current versions of the
Docker Engine now support this feature.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-21 13:36:35 +01:00
Антон Вахмин (Anton Vakhmin)
2ba2ec9547
fixed typo in runmetrics.md
2018-11-20 12:35:39 +05:00
Jeffrey Morgan
ca4ffb1ee2
Merge branch 'master' into consolidation-changes
2018-11-14 18:30:02 -05:00
Jeffrey Morgan
d15739c5e7
Merge branch 'master' into consolidation-changes
2018-11-14 18:29:09 -05:00
Simon Heimberg
059593c865
Show hint how to find out what data can be printed
...
This hint is unnecessary for inspect commands since this is the default. But for other commands, I regularly find out again this trick.
2018-11-13 08:55:42 +01:00
Maria Bermudez
d7a21d29db
Merge public:master into private
2018-11-02 10:03:18 -07:00
milindchawre
2fc040689e
Fixes #37610 : Documentation changes for container hostname
2018-10-21 09:09:01 +00:00