summaryrefslogtreecommitdiff
path: root/docs/admin
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23193 from allencloud/fix-typosSven Dowideit2016-06-063-3/+3
| | | | | | | use grep to find all a/an typos (cherry picked from commit 98c245c9e63793cf8ca03c5500e0820447c1861c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #23165 from thaJeztah/update-logging-code-hintsSebastiaan van Stijn2016-06-067-89/+131
| | | | | | | cleanup logging driver documentation (cherry picked from commit 8d75709f90ba9926d41cd7b91bb316e336af8f8c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #23035 from SvenDowideit/fix-linksSebastiaan van Stijn2016-05-271-2/+2
| | | | | | | Fix up stale links (cherry picked from commit bd5c9f59ea9dde983bf40b36f16311e550a5c2e4) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
* docs: note requirements for systemd drop-in filenamesLars Kellogg-Stedman2016-05-111-9/+13
| | | | | | | | | | | | | | the documentations says that you can drop "a file" into the `docker.service.d` directory, but does not note that the file must end with `.conf` in order to be recognized by systemd. This can lead to some [confusion][] if readers are not previously familiar with systemd. [confusion]: https://botbot.me/freenode/docker/2016-05-06/?msg=65605541&page=11 Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com> (cherry picked from commit 987b03054af8bfa5147465d4fe5d5a554cd5fee3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* docs: update supervisord exampleSebastiaan van Stijn2016-05-111-66/+102
| | | | | | | | | | | | | | This updates the supervisor example documentation to use an up-to-date version of Ubuntu. Also reduced the use of "royal We", and tweaked some language. Finally, added some language hints for code-highlighting. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit e38678e6601cc597b621aaf3cf630419a7963ae9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Docs: fixing typos in admin/supervisorTomasz Kopczynski2016-05-111-2/+2
| | | | | | Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl> (cherry picked from commit 74d382ff8de9a870d48e7fd4cc63bb9ee254f3de) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* closes #11703 closes #11560Robin Naundorf2016-04-281-150/+0
| | | | | | Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de> (cherry picked from commit 297d6c04a31f39ff24fcebad8d82c43e0bcf6900) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* systemctl show, no need to sudoThomas Sjögren2016-03-311-5/+5
| | | | | Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com> (cherry picked from commit ea1d8d6f82ee76f35b98b6ce2e3c543f24cf4b6c)
* Merge pull request #21367 from mlaventure/containerd-docs-cleanupTibor Vass2016-03-221-2/+2
|\ | | | | Remove unneeded references to execDriver
| * Remove unneeded references to execDriverKenfe-Mickael Laventure2016-03-211-2/+2
| | | | | | | | | | | | | | | | This includes: - updating the docs - removing dangling variables Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
* | fluentd logger: support all options besides Unix socketsPierre Carrier2016-03-212-5/+13
| | | | | | | | | | | | Mostly useful for docker/docker#19438. Signed-off-by: Pierre Carrier <pierre@meteor.com>
* | Revert "Added flag to ignore fluentd connect error on container start"Pierre Carrier2016-03-202-18/+1
|/ | | | | | This reverts commit 3cf82ff1ab14e1ddd2b629524e894ac359168388. Signed-off-by: Pierre Carrier <pierre@meteor.com>
* Add documentation on the dump-stack-traces capability of the daemonPhil Estes2016-03-181-0/+18
| | | | | | | | Add a paragraph about how to force a stack trace dump to the daemon log. This feature was added in Docker 1.9 I believe, but documentation was never added. Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
* Merge pull request #19831 from cloudflare/optimize-gelfAntonio Murdaca2016-03-151-0/+10
|\ | | | | GELF logger: Add gelf-compression-type and gelf-compression-level
| * add gelf option to customize compression type and levelDaniel Dao2016-03-151-0/+10
| | | | | | | | | | | | | | | | this allows user to choose the compression type (i.e. gzip/zlib/none) using --log-opt=gelf-compression-type=none or the compression level (-1..9) using --log-opt=gelf-compression-level=0 for gelf driver. Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
* | Merge pull request #20121 from solganik/masterBrian Goff2016-03-141-0/+6
|\ \ | |/ |/| syslog format
| * Fixes #18712. Add rfc5424 log format for syslog.Solganik Alexander2016-03-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously docker used obsolete rfc3164 syslog format for syslog. rfc3164 explicitly uses semicolon as a separator between 'TAG' and 'Content' section of the log message. Docker uses semicolon as a separator between image name and version tag. When {{.ImageName}} was used as a tag expression and contained ":" syslog parser mistreated "tag" part of the image name as syslog message body, which resulted in incorrect "syslogtag" been reported by syslog daemon. Use of rfc5424 log format partually fixes the issue as it does not use semicolon as a separator. However using default rfc5424 syslog format itroduces backward incompatability because rsyslog template keyword %syslogtag% is parsed differently. In rfc3164 it uses the "TAG" part reported before the "pid" part. In rfc5424 it uses "appname" part reported before the pid part, while tag part is introduced by %msgid% part. For more information on rsyslog configuration properties see: http://www.rsyslog.com/doc/master/configuration/properties.html Added two options to specify logging in either rfc5424, rfc3164 format or unix format omitting hostname in order to keep backwards compatability with previous versions. Signed-off-by: Solganik Alexander <solganik@gmail.com>
* | Merge pull request #20958 from calavera/basic_function_templatesAlexander Morozov2016-03-101-0/+66
|\ \ | |/ |/| Provide basic string manipulation functions for template executions.
| * Provide basic string manupilation functions for template executions.David Calavera2016-03-091-0/+66
| | | | | | | | | | | | | | This change centralizes the template manipulation in a single package and adds basic string functions to their execution. Signed-off-by: David Calavera <david.calavera@gmail.com>
* | Update links to Docker HubSebastiaan van Stijn2016-03-041-1/+1
|/ | | | | | | Updates links to Docker Hub with their new URLs to prevent redirects. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* daemon/logger: Add logging driver for Google Cloud LoggingMike Danese2016-03-012-0/+81
| | | | Signed-off-by: Mike Danese <mikedanese@google.com>
* Windows: Add ETW logging driver plug-inCedric Davies2016-02-163-0/+80
| | | | Signed-off-by: Cedric Davies <cedricda@microsoft.com>
* Fix incorrect alias for systemd docsSebastiaan van Stijn2016-02-051-1/+1
| | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #18041 from ↵David Calavera2016-01-272-1/+18
|\ | | | | | | | | jnummelin/feature/fluent-logger-ignore-connect-error-flag Added flag to ignore fluentd connect error on container start
| * Added flag to ignore fluentd connect error on container startJussi Nummelin2016-01-272-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com> Changed buffer size to 1M and removed unnecessary fmt call Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com> Updated docs for the new fluentd opts Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>
* | Add tag support to journald logging driver, closes #19556Ivan Babrou2016-01-272-1/+7
|/ | | | Signed-off-by: Ivan Babrou <ibobrik@gmail.com>
* Creating Engine specific menuMary Anthony2016-01-2627-0/+2579
Fixing the links Updating with Seb's comments Adding weight Fixing the engine aliases Updating after Arun pushed Removing empty file Signed-off-by: Mary Anthony <mary@docker.com>
View Lorry Controller Status