Files
docker-cli/components/cli/man
Brian Goff bfdafc4b57 Add support for reading logs extra attrs
The jsonlog logger currently allows specifying envs and labels that
should be propagated to the log message, however there has been no way
to read that back.

This adds a new API option to enable inserting these attrs back to the
log reader.

With timestamps, this looks like so:
```
92016-04-08T15:28:09.835913720Z foo=bar,hello=world hello
```

The extra attrs are comma separated before the log message but after
timestamps.

Without timestaps it looks like so:
```
foo=bar,hello=world hello
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ce224853a2
Component: cli
2017-06-02 00:07:37 +00:00
..
2017-06-02 00:07:31 +00:00
2017-06-02 00:06:57 +00:00
2017-06-02 00:07:29 +00:00
2017-06-02 00:07:12 +00:00
2017-06-02 00:07:27 +00:00
2017-06-02 00:07:30 +00:00
2017-06-02 00:07:16 +00:00
2017-06-02 00:07:30 +00:00
2017-06-02 00:06:57 +00:00
2017-06-02 00:06:57 +00:00
2017-06-02 00:07:30 +00:00
2017-06-02 00:07:12 +00:00
2017-06-02 00:07:16 +00:00
2017-06-02 00:07:30 +00:00
2017-06-02 00:07:32 +00:00
2017-06-02 00:07:16 +00:00
2017-06-02 00:06:57 +00:00
2017-06-02 00:07:37 +00:00
2017-06-02 00:07:02 +00:00
2017-06-02 00:06:57 +00:00

Docker Documentation

This directory contains the Docker user manual in the Markdown format. Do not edit the man pages in the man1 directory. Instead, amend the Markdown (*.md) files.

Generating man pages from the Markdown files

The recommended approach for generating the man pages is via a Docker container using the supplied Dockerfile to create an image with the correct environment. This uses go-md2man, a pure Go Markdown to man page generator.

Building the md2man image

There is a Dockerfile provided in the /man directory of your 'docker/docker' fork.

Using this Dockerfile, create a Docker image tagged docker/md2man:

docker build -t docker/md2man .

Utilizing the image

From within the /man directory run the following command:

docker run -v $(pwd):/man -w /man -i docker/md2man ./md2man-all.sh

The md2man Docker container will process the Markdown files and generate the man pages inside the /man/man1 directory of your fork using Docker volumes. For more information on Docker volumes see the man page for docker run and also look at the article [Sharing Directories via Volumes] (https://docs.docker.com/use/working_with_volumes/).