centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-28 23:08:49 +07:00
Code Issues Packages Projects Releases Wiki Activity
44,989 Commits 54 Branches 28 Tags
89708c427b47f2deb3a95ffdfd4586cd45cfdfd1
Commit Graph

41 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
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
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
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
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
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
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
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
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
John Mulhausen
1a75a36169 Add alias to fix #388 2016-10-31 14:05:21 -07:00
Misty Stanley-Jones
f39d909fdd Formatting 2016-10-25 11:40:39 -07:00
Misty Stanley-Jones
458ab09eed Formatting 2016-10-25 11:37:56 -07:00
Benjamin R. Haskell
362e94b2bc Disable Liquid templating for blocks with {{ 
Instead of disabling templating for entire files, fix instances
individually by wrapping blocks in:

    ```{% raw %}
    ... content ...
    {% endraw %}```

Signed-off-by: Benjamin R. Haskell <docker@benizi.com>
 2016-10-07 00:58:08 -04:00
Benjamin R. Haskell
65ec3a3763 Revert pull request #48 
Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
 2016-10-07 00:56:17 -04:00
Benjamin R. Haskell
b3a620808a Fix formatting for Markdown files containing {{ 
They're usually examples of Go-style text templates.  But, Liquid templating is treating them as variable substitutions.  E.g., in `engine/reference/commandline/ps.md`:

```bash
$ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}"
```

is rendered as:

```bash
$ docker ps --filter volume=remote-volume --format "table \t"
```

Solution is to wrap entire files in `{% raw %} ... {% endraw %}` blocks.
 2016-10-05 01:58:24 -04:00
Pascal Borreli
6cd3fe8bd2 Fixed typos 2016-09-30 01:52:12 +01:00
Misty Stanley-Jones
d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones
9d5e59d503 Moved engine imported docs to the engine subdirectory 2016-09-29 11:19:31 -07:00