Commit Graph

65 Commits

Author SHA1 Message Date
Brian Kaufman
34b5b993ca Default docker log name is container ID
The default docker log name is the 12 character container ID, the sample test.conf setup above filters for Docker.* which will not pick anything up unless users start their containers with at "Docker" tag
2017-02-14 12:53:12 -05:00
Steven Arnott
7823e98796 Update example for --syslog-address for unix path
Update example for --syslog-address for unix path to include 'unix:' protocol that is needed.
2017-02-07 12:54:14 -05:00
Misty Stanley-Jones
0055c98052 Merge branch 'master' into fix-broken-link 2017-01-26 11:41:19 -08:00
Thomas Auffredou
59034f94f0 Update log_tags.md (#1325)
Update reference url to logging context
2017-01-24 15:32:07 -08:00
Dominik-K
9b25ec62c0 resource_constraints.md: Fixed broken table format (#1348)
+ small typo fix
2017-01-24 14:32:45 -08:00
Sebastiaan van Stijn
15697dab7a fix link to logging context
this source file no longer exists on "master",
so replacing the link with a permalink on the
1.13 tag.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 15:36:59 +01:00
Jérôme Petazzoni
9a3164a9d2 Add missing triple quote 2017-01-20 14:01:58 -08:00
paddyboyle
fd94b9c2c4 Update systemd.md (#1185)
* take a stab at fixing a broken link

Signed-off-by: LRubin <lrubin@docker.com>

* Update systemd.md

Removed the quotes from the --graph option on line 130.  Using quotes works for version 1.12 of Docker but with 1.13, Docker will create a directory named <double-quotes> under / and then create a directory of mnt/docker-data" under that directory.
2017-01-20 12:12:26 -08:00
Misty Stanley-Jones
584acf397b Fix a couple of Liquid errors 2017-01-19 12:06:33 -08:00
Misty Stanley-Jones
46e044ec59 Fixing double curly braces 2017-01-19 11:09:49 -08:00
Misty Stanley-Jones
4043237675 Document new CPU scheduling flags
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-01-19 10:38:49 -08:00
Waldemar Quevedo
9e20d71853 Add NATS client as option for publishing container logs (#369)
* Add NATS client as option for publishing container logs

Signed-off-by: Waldemar Quevedo <waldemar.quevedo@gmail.com>
2017-01-19 10:31:38 -08:00
Carlos Alexandro Becker
4b631d8025 Create logentries.md (#244)
* Create logentries.md

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
2017-01-19 10:16:52 -08:00
Akira Koyasu
eb93d33609 add unix-sockets support in Fluentd logging driver
Signed-off-by: Akira Koyasu <mail@akirakoyasu.net>
2017-01-19 10:16:51 -08:00
French Ben
2bc543c90a Added raw tags
Signed-off-by: French Ben <frenchben@docker.com>
2017-01-19 10:15:55 -08:00
French Ben
04c11a3d2b Updated wording on log stream default
Signed-off-by: French Ben <frenchben@docker.com>
2017-01-19 10:15:55 -08:00
French Ben
06cfd9e135 Updated docs to show full container ID 2017-01-19 10:15:55 -08:00
French Ben
4567784f3a Changed wording for tag description 2017-01-19 10:15:54 -08:00
French Ben
0e10a6618c Added details about tag support for AWS log driver
Signed-off-by: French Ben <frenchben@docker.com>
2017-01-19 10:15:50 -08:00
Misty Stanley-Jones
e3a3145cd9 Sync vnext-engine branch to docker/docker SHA 2f12d2808464dcfdf45e0920fd508ce0ff12bd29
This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs
2017-01-19 10:10:15 -08:00
Misty Stanley-Jones
0658ba7292 Merge pull request #622 from mstanleyjones/add_info_about_docker_log
Add info about using docker logs
2017-01-18 16:04:26 -08:00
Misty Stanley-Jones
e341bee9ae Merge pull request #997 from mstanleyjones/254_improve_logging_topic
Standardize formatting and content, add logging examples
2017-01-18 16:01:23 -08:00
Sebastiaan van Stijn
fdef92c118 Update instructions for systemd drop-ins
When creating a `/etc/systemd/system/docker.service`
unit file, that file _replaces_ the default
(`/lib/systemd/system/docker.service`) unit file.

While this may be intended by some, this section
describes how to use "partial" unit files ("drop-ins")
to override only certain properties of the default
unit file.

This patch removes the mention of
`/etc/systemd/system/docker.service` to prevent
users from inadvertently replacing the default
unit file.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 14:24:10 +01:00
Misty Stanley-Jones
d536881651 Standardize formatting and content, add logging examples
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-12-28 16:02:40 -08:00
David M. Karr (fullname at gmail.com)
7dd8315e4c Update host_integration.md
Typically, when you run an image from the command line, you would use "-d" for "detached mode", and when that appears to work, someone might paste the working command line into "ExecStart", which would then mysteriously fail because ExecStart expects a foreground process.
2016-12-28 09:26:47 -08:00
Peter Dave Hello
5919563eb8 Lossless Image optimization (#959)
* re-compress jpg images losslessly using jpegoptim

* re-compress png images losslessly using zopflipng
2016-12-21 11:12:13 -08:00
Nils Otto Johansen
4e2ee1a40c documenting rateLimit wich leads to the confusion of #28641 (#670)
* documenting rateLimit which leads to the confusion of #28641
2016-12-19 11:15:45 -08:00
Adrien Duermael
50ee158a65 CI - added test for keywords in markdown frontmatters (#805)
* added test for keywords

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in some md files for tests to pass

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in /datacenter

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* tests/Dockerfile: no need to add git

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* tests/Dockerfile: changed maintainer

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-06 16:45:11 -08:00
Misty Stanley-Jones
81400442e9 Merge pull request #710 from miaoyq/completed-journald-metadata
Completed metadata of the journald log driver
2016-11-30 17:43:27 -08:00
Sergey Kukunin
9b1b56a05d Extend Logging documentation (#722)
* Extend Logging documentation

Make it more explicit, fix confusion about `json-file` defaults driver

* Added how to find the default logging driver
2016-11-30 10:49:49 -08:00
Misty Stanley-Jones
d74f9153b9 Merge pull request #412 from mstanleyjones/troubleshooting_volume_errors.md
Add topic about troubleshooting volume problems
2016-11-28 16:15:54 -08:00
John Mulhausen
a5bf14e5f9 Merge pull request #334 from mstanleyjones/run_reference_reorg
Add topic about limiting container resources
2016-11-28 14:37:10 -08:00
Misty Stanley-Jones
756f4d974c Fix some doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 11:32:17 -08:00
Yanqiang Miao
bda7d072ec Completed metadata of the journald log driver
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-24 18:30:25 +08:00
Bhumika Bayani
707b0359f4 live-restore unsupported on Windows (#564)
* live-restore unsupported on Windows
Replaced heading with note. Review comment implementation
Fixes doc for https://github.com/docker/docker/issues/28295
Added quote formatting for a note

* Moved the note, some rewording

The situation is actually more complicated than that. If you develop Linux containers on Windows, you can still use Live Restore. So I tried to make it more clear.

Also moved the note to the top of the file since there is no point making people read a whole long thing if it won't work for them.
2016-11-18 14:36:26 -08:00
Misty Stanley-Jones
97d8ab167d Add topic about limiting container resources
Moved from upstream PR https://github.com/docker/docker/pull/26791

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 0a924369dc086a19bb0484ca2a53fb485ed99801)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-18 12:02:35 -08:00
Misty Stanley-Jones
7d099ea4b0 Add info about using docker logs
Fixes #293

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-17 09:15:00 -08:00
Gaetan
a5e01e1844 fix type of keywords entry in frontmatter (in /engine/) (#552)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:45:24 -08:00
Misty Stanley-Jones
a6fa66c786 Add topic about troubleshooting volume problems
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-08 09:20:11 -08:00
Hernandes Benevides de Sousa
71ff5c1589 Add missing whitespace (#486) 2016-11-07 13:13:33 -08:00
Misty Stanley-Jones
eb5c8670bc Change instances of alias: to redirect_from:
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 17:07:02 -07:00
John Mulhausen
558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438)
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
Misty Stanley-Jones
1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
2016-11-04 13:33:29 -07:00
Gaetan
8bb4d6226a fix more frontmatter keywords values (#439)
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
Gökay Gürcan
ba9ea84fee fix: Add line breaks before and after code blocks 2016-11-02 11:20:02 +02:00
Adrien Duermael
8fa5f3a5de absolute links to docs.docker.com are now relative links
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-01 17:01:41 -07:00
John Mulhausen
f201f50501 Merge pull request #399 from aduermael/master
removed menu.md files
2016-11-01 12:07:20 -07:00
John Mulhausen
1a75a36169 Add alias to fix #388 2016-10-31 14:05:21 -07:00
Adrien Duermael
e7ab7f7d03 removed menu.md files
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-10-31 13:45:56 -07:00
Misty Stanley-Jones
25a9bcf2d0 Formatting 2016-10-25 11:51:57 -07:00