docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,517 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

70 Commits

Author SHA1 Message Date
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
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 ca4ffb1ee2 Merge branch 'master' into consolidation-changes 2018-11-14 18:30:02 -05:00
Jeffrey Morgan d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
Simon Heimberg 059593c865
Show hint how to find out what data can be printed 
This hint is unnecessary for inspect commands since this is the default. But for other commands, I regularly find out again this trick.
 2018-11-13 08:55:42 +01:00
Maria Bermudez d7a21d29db Merge public:master into private 2018-11-02 10:03:18 -07: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
ddeyo cd9541f1e9 New topic for cluster metrics 2018-09-07 10:43:38 -07:00
ddeyo 2d5142f252 restore topic to original state 2018-09-07 10:38:20 -07:00
ddeyo fd57647e6f Adding switch to Kubernetes 2018-09-06 21:23:47 -07:00
ddeyo 3b63a5515b edits to topic 2018-09-06 21:17:10 -07:00
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" 
This reverts commit 4c95d161ca.
 2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" 
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
 2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" 
This reverts commit 14080c18bd.
 2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" 
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
 2018-08-29 14:47:31 -07:00
Jeff Geerling 38ecdd498f Add note about not using free to determine swap availability inside container. 2018-06-15 15:27:41 -07:00
Emiliano 'AlberT' Gabrielli b04bb8be45 fix nginx logs links 
the log file is linked to the device, not viceversa :)
 2018-06-15 14:51:45 -07:00
Joao Fernandes 488dff36a0 Fix --format split 2018-06-05 14:27:20 -07:00
Mark Church afa6b0cd1b Update live-restore.md 2018-05-22 11:03:34 -07:00
Mattias Berge 56bfc9b782 Update resource_constraints.md 
corrects information about quota. Its not about guarantee, it's about a hard limit before throttling.
 2018-05-15 16:05:59 -07:00
Ethan Bell 107a0ce000 Add port publish example for particular host IP 
Addresses #6478
 2018-05-03 16:33:12 -07:00
Joao Fernandes b381efa359 Revert "TCP is not valid option for GELF log driver" 
This reverts commit c750d9d5b4.
 2018-05-01 15:34:38 -07:00
ada c750d9d5b4 TCP is not valid option for GELF log driver 2018-05-01 14:57:49 -07:00
vijay rama raju samanuri 541e0164be typo on run option (#6547) 2018-04-26 10:50:05 -07:00
Joao Fernandes 572869c3a1 Fix typos, address feedback 2018-04-06 13:51:29 -07:00
Joao Fernandes 49fe06f037 Don't share the --data-root directory between engines 2018-04-06 13:51:29 -07:00
Joao Fernandes 185c4f21c1 Improve how to configure engine 2018-04-06 13:51:29 -07:00
Filipe Corrêa 9a3a4e5a4b Fix misspelling (#6384) 2018-04-06 10:44:40 -07:00
Gwendolynne Barr 4c2fc6dee7
Add redirect (#6293) 2018-03-23 10:28:25 -07:00
Gwendolynne Barr b679d3412c Revert "Fix docs for "unless-stopped" restart policy (#6287)" 
This reverts commit 07fade089b.
 2018-03-23 08:40:45 -07:00
adw1n 07fade089b Fix docs for "unless-stopped" restart policy (#6287) 2018-03-23 05:50:54 -07:00
Akim Demaille 14b53b68c3 Jekyll: don't put {% raw %} directives in pre blocks 
Replace all occurrences of

    ```foo
    {% raw %}
    bar
    {% endraw %}
    ```

(which generates spurious empty lines in the rendered pre block) with

    {% raw %}
    ```foo
    bar
    ```
    {% endraw %}

Also, fix some occurrences where the raw section is too large and
prevented interpretation of Jekyll directives.

This is the syntax used in the documentation of Jekyll itself:

https://raw.githubusercontent.com/jekyll/jekyll/master/docs/_docs/templates.md

FTR, done with two perl substitutions:

    '^([\t ]*```[^\n]*
    )([ \t]*\{% raw %\}[^\n]*
    )' '$2$1'

and

    '^([ \t]*\{% endraw %\}[^\n]*
    )([\t ]*```[^\n]*
    )' '$2$1'

and manually tweaks.  A mechanical check would be most useful.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
 2018-03-13 10:28:29 -07:00