1
0
mirror of https://github.com/docker/docs.git synced 2026-11-06 12:54:24 +03:00
Commit Graph

73 Commits

Author SHA1 Message Date
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
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
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
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
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
paigehargrave
0dab4ade68 Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00
paigehargrave
62edcf746d Update live-restore.md 2019-01-11 13:20:06 -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
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
d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
milindchawre
2fc040689e Fixes #37610 : Documentation changes for container hostname 2018-10-21 09:09:01 +00:00
Jeffrey Morgan
ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04:00
Maria Bermudez
eb608ee28d Merge branch 'master' into spelling 2018-10-04 12:18:34 -07:00
Anne Henmi
d815c080e1 Merge pull request #7399 from kavikat/patch-3
Update resource_constraints.md
2018-09-26 08:25:56 -06:00
Oscar Caballero
269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
Raphael Luba
3108ea7367 Fix typo in journald log options
The `label` option is actually called `labels`.
2018-09-23 14:40:35 +02:00
Kavika Tavui
6699ef8acf Update resource_constraints.md
Block IO is not configurable, the current documentation suggests that it is on line 12.
2018-09-20 09:41:53 -07:00
Din Tort
b4967e1bcc Updated gelf.md
Fixed an ivalid dash in --log-opt gelf-address
2018-07-04 15:11:51 +02:00
Mehmood Deshmukh
cd21fc334e Changes in the sentence structures 2018-06-24 16:22:18 +05:30
Mehmood Deshmukh
6c54043f66 Fix docs for restart policies
Clears the confusion between the policies `always` and `unless-stopped`.
2018-06-24 16:19:54 +05:30
Jeff Geerling
38ecdd498f Add note about not using free to determine swap availability inside container. 2018-06-15 15:27:41 -07:00