Commit Graph

15 Commits

Author SHA1 Message Date
Usha Mandya 1c853406e9 Remove Enterprise references 2020-07-21 14:47:01 +01:00
Sobhan Attar 9fd5223c7e
add not for non existence daemon.json 2020-07-01 11:30:11 +04:30
Sebastiaan van Stijn 727941ffdd
container config section: various markdown fixes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-08 14:00:58 +02:00
Fangzhou Li 844e8e4c70 Fix typo (#9804) 2019-11-05 13:24:57 -08:00
Bertrand Guay-Paquet fa9fbec44e
log-opts is a JSON object not an array 2019-07-31 16:18:39 +02: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
Russell Ballestrini fd088cd56f
Add a reference to the `local` log-driver 2019-02-14 14:31:49 -08: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
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 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
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
Misty Stanley-Jones 1b343beca4
Clean up information architecture (#5893)
- Move /engine/admin/ and /engine/userguide/ topics to /config/ and /develop/
- Get rid of some stub topics that are no longer needed
- Rename /engine/article-img/ to /engine/images/
- Mark ambassador linking topic as obsolete
- Flesh out multistage build topic
- Reorganize some terribly obsolete content in other files
2018-02-01 15:25:43 -08:00