centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-29 07:18:51 +07:00
Code Issues Packages Projects Releases Wiki Activity
52,197 Commits 54 Branches 28 Tags
aaa2ecf8e08e6495ce7fc598a349d0a7216cd708
Commit Graph

120 Commits

Author SHA1 Message Date
paigehargrave
d82934a2c1 Updates per Anusha's feedback (#8905) 2019-06-06 16:09:07 -04:00
Maria Bermudez
b2378c949c Standardize verb in title 2019-05-25 12:17:48 -07:00
Maria Bermudez
1e70f827e9 Merge branch 'published' into master 2019-05-20 18:52:41 -07:00
paigehargrave
c29cf8fb46 Fix broken link (#8801) 2019-05-16 18:40:29 -07:00
Maria Bermudez
da6c0eb2c4 Sync published with master (#8800) 
* Interlock link fixes (#8798)
* Logging driver 920 (#8625)
 2019-05-14 17:47:08 -07:00
Maria Bermudez
e6b1c2ef31 Logging driver 920 (#8625) 
* Logging driver port from vnext-engine

* Update json-file.md

* Update json-file.md

* Port changes from vnext-engine

* Updates based on feedback

* Added note back in

* Added note back in

* Added limitations per Anusha

* New dual logging info

* Added link to new topic

Needs verification.

* Changes per feedback.

* Updates per feedback

* Updates per feedback

* Updated 20m

* Added CE version

* Added missing comma

* Updates per feedback

* Add raw tag
Add TOC entry - subject to change

* Add entry for local logging driver

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Updates per feedback

* Updates per feedback
 2019-05-14 19:38:42 -04:00
Michael Davidson
81c15665ef Added Docker-Compose awslogs example (#8638) 
* Added docker compose aws logs information

* Fixed formatting and text

- Signed off by @bermudezmt
 2019-05-03 11:12:27 -07:00
Darwin Traver
8ece7f64eb Typo on logging driver name 2019-04-04 16:08:43 -04:00
Wang Jie
9dd27b0431 Update journald.md 2019-03-20 13:48:44 +08:00
paigehargrave
6c9c3804a0 Merge pull request #8402 from usha-mandya/8157-third-party 
Addresses 8157
 2019-03-11 13:00:39 -07:00
Maria Bermudez
234a3b4050 Update product names 2019-03-11 12:58:59 -07:00
Maria Bermudez
26d425cc8d Fix first link 2019-03-11 11:55:37 -07:00
Maria Bermudez
ccbb5e2630 Revert "Revert "Merge branch 'master' of github.com:docker/docker.github.io"" 
This reverts commit 4b5fbbdbc9.
 2019-03-08 10:53:00 -08:00
Shane Sewell
6a6fc45959 Fixed minor typo 2019-03-07 11:08:18 -06:00
usha-mandya
4317f50fdd Addresses 8157 2019-03-04 12:55:18 -08:00
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