From d3bbe11b990f03085a910ae4ad906aad1428c172 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Thu, 2 Jun 2016 18:01:02 -0700 Subject: [PATCH 01/12] Merge pull request #22763 from zreigz/doc-multiple-daemons Add documentation for running multiple daemons (cherry picked from commit 9be8f04950f918b91e3d4166597e9e2eee74fbd6) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/daemon.md | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index 863dcad1d2..e61eb8390e 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -956,3 +956,59 @@ has been provided in flags and `cluster-advertise` not, `cluster-advertise` can be added in the configuration file without accompanied by `--cluster-store` Configuration reload will log a warning message if it detects a change in previously configured cluster configurations. + + +## Running multiple daemons + +> **Note:** Running multiple daemons on a single host is considered as "experimental". The user should be aware of +> unsolved problems. This solution may not work properly in some cases. Solutions are currently under development +> and will be delivered in the near future. + +This section describes how to run multiple Docker daemons on a single host. To +run multiple daemons, you must configure each daemon so that it does not +conflict with other daemons on the same host. You can set these options either +by providing them as flags, or by using a [daemon configuration file](#daemon-configuration-file). + +The following daemon options must be configured for each daemon: + +```bash +-b, --bridge= Attach containers to a network bridge +--exec-root=/var/run/docker Root of the Docker execdriver +-g, --graph=/var/lib/docker Root of the Docker runtime +-p, --pidfile=/var/run/docker.pid Path to use for daemon PID file +-H, --host=[] Daemon socket(s) to connect to +--config-file=/etc/docker/daemon.json Daemon configuration file +--tlscacert="~/.docker/ca.pem" Trust certs signed only by this CA +--tlscert="~/.docker/cert.pem" Path to TLS certificate file +--tlskey="~/.docker/key.pem" Path to TLS key file +``` + +When your daemons use different values for these flags, you can run them on the same host without any problems. +It is very important to properly understand the meaning of those options and to use them correctly. + +- The `-b, --bridge=` flag is set to `docker0` as default bridge network. It is created automatically when you install Docker. +If you are not using the default, you must create and configure the bridge manually or just set it to 'none': `--bridge=none` +- `--exec-root` is the path where the container state is stored. The default value is `/var/run/docker`. Specify the path for +your running daemon here. +- `--graph` is the path where images are stored. The default value is `/var/lib/docker`. To avoid any conflict with other daemons +set this parameter separately for each daemon. +- `-p, --pidfile=/var/run/docker.pid` is the path where the process ID of the daemon is stored. Specify the path for your +pid file here. +- `--host=[]` specifies where the Docker daemon will listen for client connections. If unspecified, it defaults to `/var/run/docker.sock`. +- `--config-file=/etc/docker/daemon.json` is the path where configuration file is stored. You can use it instead of +daemon flags. Specify the path for each daemon. +- `--tls*` Docker daemon supports `--tlsverify` mode that enforces encrypted and authenticated remote connections. +The `--tls*` options enable use of specific certificates for individual daemons. + +Example script for a separate “bootstrap” instance of the Docker daemon without network: + +```bash +$ docker daemon \ + -H unix:///var/run/docker-bootstrap.sock \ + -p /var/run/docker-bootstrap.pid \ + --iptables=false \ + --ip-masq=false \ + --bridge=none \ + --graph=/var/lib/docker-bootstrap \ + --exec-root=/var/run/docker-bootstrap +``` From 5df3c258a17507923905dac4c30d3eafe6822a56 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 27 May 2016 21:21:32 +0200 Subject: [PATCH 02/12] Merge pull request #23060 from friism/add-power-shell-example Add power shell example (cherry picked from commit 068d466cc7cd4ef3915b983b61e9cd029936ac90) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/build.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index f0f30a0ced..881113af8e 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -79,7 +79,11 @@ Build Syntax Suffix | Commit Used | Build Context Used Instead of specifying a context, you can pass a single Dockerfile in the `URL` or pipe the file in via `STDIN`. To pipe a Dockerfile from `STDIN`: - docker build - < Dockerfile + $ docker build - < Dockerfile + +With Powershell on Windows, you can run: + + Get-Content Dockerfile | docker build - If you use STDIN or specify a `URL`, the system places the contents into a file called `Dockerfile`, and any `-f`, `--file` option is ignored. In this From 89b2a14932e5b4c16392d2a500acd559d196bda0 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 30 May 2016 18:21:26 +0200 Subject: [PATCH 03/12] Merge pull request #23106 from LINBIT/master Add the DRBD Docker Volume Plugin to the documentation (cherry picked from commit ef42e2f214dd528e3520d394d2d648de92f703cd) Signed-off-by: Sebastiaan van Stijn --- docs/extend/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/extend/plugins.md b/docs/extend/plugins.md index 7881c73c29..fe80ac6d98 100644 --- a/docs/extend/plugins.md +++ b/docs/extend/plugins.md @@ -52,6 +52,7 @@ Plugin [Blockbridge plugin](https://github.com/blockbridge/blockbridge-docker-volume) | A volume plugin that provides access to an extensible set of container-based persistent storage options. It supports single and multi-host Docker environments with features that include tenant isolation, automated provisioning, encryption, secure deletion, snapshots and QoS. [Contiv Volume Plugin](https://github.com/contiv/volplugin) | An open source volume plugin that provides multi-tenant, persistent, distributed storage with intent based consumption using ceph underneath. [Convoy plugin](https://github.com/rancher/convoy) | A volume plugin for a variety of storage back-ends including device mapper and NFS. It's a simple standalone executable written in Go and provides the framework to support vendor-specific extensions such as snapshots, backups and restore. +[DRBD plugin](https://www.drbd.org/en/supported-projects/docker) | A volume plugin that provides highly available storage replicated by [DRBD](https://www.drbd.org). Data written to the docker volume is replicated in a cluster of DRBD nodes. [Flocker plugin](https://clusterhq.com/docker-plugin/) | A volume plugin that provides multi-host portable volumes for Docker, enabling you to run databases and other stateful containers and move them around across a cluster of machines. [gce-docker plugin](https://github.com/mcuadros/gce-docker) | A volume plugin able to attach, format and mount Google Compute [persistent-disks](https://cloud.google.com/compute/docs/disks/persistent-disks). [GlusterFS plugin](https://github.com/calavera/docker-volume-glusterfs) | A volume plugin that provides multi-host volumes management for Docker using GlusterFS. From a6bbdf347a937b2312cc977b88cf36a07f89dfe1 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 1 Jun 2016 13:45:28 +0200 Subject: [PATCH 04/12] Merge pull request #23143 from bfirsh/remove-status-column-from-clinet-libraries-page Remove status column from client libraries page (cherry picked from commit 74c7363965625848c32a5af80526fb65ecb26064) Signed-off-by: Sebastiaan van Stijn --- .../api/remote_api_client_libraries.md | 37 ++++--------------- 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/docs/reference/api/remote_api_client_libraries.md b/docs/reference/api/remote_api_client_libraries.md index b82062deff..03123d61ab 100644 --- a/docs/reference/api/remote_api_client_libraries.md +++ b/docs/reference/api/remote_api_client_libraries.md @@ -11,24 +11,22 @@ weight = 90 # Docker Remote API client libraries -These libraries have not been tested by the Docker maintainers for -compatibility. Please file issues with the library owners. If you find -more library implementations, please list them in Docker doc bugs and we -will add the libraries here. +These libraries make it easier to build applications on top of the Docker +Remote API with various programming languages. They have not been tested by the +Docker maintainers for compatibility, so if you run into any issues, file them +with the library maintainers. - - + + - - @@ -36,122 +34,101 @@ will add the libraries here. - - - - - - - - - - - - - + - - - - - - - -
Language/Framework Name RepositoryStatus
C# Docker.DotNet https://github.com/ahmetalpbalkan/Docker.DotNetActive
C++ lasote/docker_client https://github.com/lasote/docker_clientActive
Erlang erldocker https://github.com/proger/erldockerActive
Dart bwu_docker https://github.com/bwu-dart/bwu_dockerActive
Go engine-api https://github.com/docker/engine-apiActive
Gradle gradle-docker-plugin https://github.com/gesellix/gradle-docker-pluginActive
Groovy docker-client https://github.com/gesellix/docker-clientActive
Haskell docker-hs https://github.com/denibertovic/docker-hsActive
HTML (Web Components) docker-elements https://github.com/kapalhq/docker-elementsActive
Java docker-java https://github.com/docker-java/docker-javaActive
Java docker-client https://github.com/spotify/docker-clientActive
NodeJS dockerodehttps://github.com/apocas/dockerode - Install via NPM: npm install dockerodeActivehttps://github.com/apocas/dockerode
Perl Eixo::Docker https://github.com/alambike/eixo-dockerActive
PHP Docker-PHP https://github.com/docker-php/docker-phpActive
Python docker-py https://github.com/docker/docker-pyActive
Ruby docker-api https://github.com/swipely/docker-apiActive
Rust docker-rust https://github.com/abh1nav/docker-rustActive
Rust shiplift https://github.com/softprops/shipliftActive
Scala tugboat https://github.com/softprops/tugboatActive
Scala reactive-docker https://github.com/almoehi/reactive-dockerActive
From cc68a963e05540c2f39f4d5445cd6350b39e536d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 1 Jun 2016 17:55:24 +0200 Subject: [PATCH 05/12] Merge pull request #23165 from thaJeztah/update-logging-code-hints cleanup logging driver documentation (cherry picked from commit 8d75709f90ba9926d41cd7b91bb316e336af8f8c) Signed-off-by: Sebastiaan van Stijn --- docs/admin/logging/etwlogs.md | 1 - docs/admin/logging/fluentd.md | 1 - docs/admin/logging/gcplogs.md | 1 - docs/admin/logging/journald.md | 5 +- docs/admin/logging/log_tags.md | 2 +- docs/admin/logging/overview.md | 209 ++++++++++++++++++++------------- docs/admin/logging/splunk.md | 1 - 7 files changed, 131 insertions(+), 89 deletions(-) diff --git a/docs/admin/logging/etwlogs.md b/docs/admin/logging/etwlogs.md index 5b98fd5495..17fb65ae51 100644 --- a/docs/admin/logging/etwlogs.md +++ b/docs/admin/logging/etwlogs.md @@ -5,7 +5,6 @@ description = "Describes how to use the etwlogs logging driver." keywords = ["ETW, docker, logging, driver"] [menu.main] parent = "smn_logging" -weight=2 +++ diff --git a/docs/admin/logging/fluentd.md b/docs/admin/logging/fluentd.md index 538af7b1b2..21d4b74c56 100644 --- a/docs/admin/logging/fluentd.md +++ b/docs/admin/logging/fluentd.md @@ -6,7 +6,6 @@ description = "Describes how to use the fluentd logging driver." keywords = ["Fluentd, docker, logging, driver"] [menu.main] parent = "smn_logging" -weight=2 +++ diff --git a/docs/admin/logging/gcplogs.md b/docs/admin/logging/gcplogs.md index 08fd858da0..c92c17a102 100644 --- a/docs/admin/logging/gcplogs.md +++ b/docs/admin/logging/gcplogs.md @@ -5,7 +5,6 @@ description = "Describes how to use the Google Cloud Logging driver." keywords = ["gcplogs, google, docker, logging, driver"] [menu.main] parent = "smn_logging" -weight = 2 +++ diff --git a/docs/admin/logging/journald.md b/docs/admin/logging/journald.md index 90c9720319..8476dd062f 100644 --- a/docs/admin/logging/journald.md +++ b/docs/admin/logging/journald.md @@ -1,12 +1,11 @@ diff --git a/docs/admin/logging/log_tags.md b/docs/admin/logging/log_tags.md index 9b2e098d9f..41297d97a8 100644 --- a/docs/admin/logging/log_tags.md +++ b/docs/admin/logging/log_tags.md @@ -6,7 +6,7 @@ description = "Describes how to format tags for." keywords = ["docker, logging, driver, syslog, Fluentd, gelf, journald"] [menu.main] parent = "smn_logging" -weight = 1 +weight = -1 +++ diff --git a/docs/admin/logging/overview.md b/docs/admin/logging/overview.md index 8a7cd12ffb..0c8c0e7b44 100644 --- a/docs/admin/logging/overview.md +++ b/docs/admin/logging/overview.md @@ -6,7 +6,7 @@ description = "Configure logging driver." keywords = ["docker, logging, driver, Fluentd"] [menu.main] parent = "smn_logging" -weight=-1 +weight=-99 +++ @@ -15,10 +15,13 @@ weight=-1 The container can have a different logging driver than the Docker daemon. Use the `--log-driver=VALUE` with the `docker run` command to configure the -container's logging driver. The following options are supported: +container's logging driver. If the `--log-driver` option is not set, docker +uses the default (`json-file`) logging driver. The following options are +supported: -| `none` | Disables any logging for the container. `docker logs` won't be available with this driver. | +| Driver | Description | |-------------|-------------------------------------------------------------------------------------------------------------------------------| +| `none` | Disables any logging for the container. `docker logs` won't be available with this driver. | | `json-file` | Default logging driver for Docker. Writes JSON messages to file. | | `syslog` | Syslog logging driver for Docker. Writes log messages to syslog. | | `journald` | Journald logging driver for Docker. Writes log messages to `journald`. | @@ -32,40 +35,58 @@ container's logging driver. The following options are supported: The `docker logs`command is available only for the `json-file` and `journald` logging drivers. -The `labels` and `env` options add additional attributes for use with logging drivers that accept them. Each option takes a comma-separated list of keys. If there is collision between `label` and `env` keys, the value of the `env` takes precedence. +The `labels` and `env` options add additional attributes for use with logging +drivers that accept them. Each option takes a comma-separated list of keys. If +there is collision between `label` and `env` keys, the value of the `env` takes +precedence. -To use attributes, specify them when you start the Docker daemon. +To use attributes, specify them when you start the Docker daemon. For example, +to manually start the daemon with the `json-file` driver, and include additional +attributes in the output, run the following command: -``` -docker daemon --log-driver=json-file --log-opt labels=foo --log-opt env=foo,fizz +```bash +$ docker daemon \ + --log-driver=json-file \ + --log-opt labels=foo \ + --log-opt env=foo,fizz ``` -Then, run a container and specify values for the `labels` or `env`. For example, you might use this: +Then, run a container and specify values for the `labels` or `env`. For +example, you might use this: -``` -docker run --label foo=bar -e fizz=buzz -d -P training/webapp python app.py +```bash +$ docker run -dit --label foo=bar -e fizz=buzz alpine sh ``` This adds additional fields to the log depending on the driver, e.g. for `json-file` that looks like: - "attrs":{"fizz":"buzz","foo":"bar"} +```json +"attrs":{"fizz":"buzz","foo":"bar"} +``` ## json-file options The following logging options are supported for the `json-file` logging driver: - --log-opt max-size=[0-9+][k|m|g] - --log-opt max-file=[0-9+] - --log-opt labels=label1,label2 - --log-opt env=env1,env2 +```bash +--log-opt max-size=[0-9+][k|m|g] +--log-opt max-file=[0-9+] +--log-opt labels=label1,label2 +--log-opt env=env1,env2 +``` -Logs that reach `max-size` are rolled over. You can set the size in kilobytes(k), megabytes(m), or gigabytes(g). eg `--log-opt max-size=50m`. If `max-size` is not set, then logs are not rolled over. +Logs that reach `max-size` are rolled over. You can set the size in +kilobytes(k), megabytes(m), or gigabytes(g). eg `--log-opt max-size=50m`. If +`max-size` is not set, then logs are not rolled over. -`max-file` specifies the maximum number of files that a log is rolled over before being discarded. eg `--log-opt max-file=100`. If `max-size` is not set, then `max-file` is not honored. +`max-file` specifies the maximum number of files that a log is rolled over +before being discarded. eg `--log-opt max-file=100`. If `max-size` is not set, +then `max-file` is not honored. -If `max-size` and `max-file` are set, `docker logs` only returns the log lines from the newest log file. +If `max-size` and `max-file` are set, `docker logs` only returns the log lines +from the newest log file. ## syslog options @@ -82,17 +103,20 @@ The following logging options are supported for the `syslog` logging driver: --log-opt tag="mailer" --log-opt syslog-format=[rfc5424|rfc3164] -`syslog-address` specifies the remote syslog server address where the driver connects to. -If not specified it defaults to the local unix socket of the running system. -If transport is either `tcp` or `udp` and `port` is not specified it defaults to `514` -The following example shows how to have the `syslog` driver connect to a `syslog` -remote server at `192.168.0.42` on port `123` +`syslog-address` specifies the remote syslog server address where the driver +connects to. If not specified it defaults to the local unix socket of the +running system. If transport is either `tcp` or `udp` and `port` is not +specified it defaults to `514` The following example shows how to have the +`syslog` driver connect to a `syslog` remote server at `192.168.0.42` on port +`123` - $ docker run --log-driver=syslog --log-opt syslog-address=tcp://192.168.0.42:123 +```bash +$ docker run --log-driver=syslog --log-opt syslog-address=tcp://192.168.0.42:123 +``` -The `syslog-facility` option configures the syslog facility. By default, the system uses the -`daemon` value. To override this behavior, you can provide an integer of 0 to 23 or any of -the following named facilities: +The `syslog-facility` option configures the syslog facility. By default, the +system uses the `daemon` value. To override this behavior, you can provide an +integer of 0 to 23 or any of the following named facilities: * `kern` * `user` @@ -116,18 +140,19 @@ the following named facilities: * `local7` `syslog-tls-ca-cert` specifies the absolute path to the trust certificates -signed by the CA. This option is ignored if the address protocol is not `tcp+tls`. +signed by the CA. This option is ignored if the address protocol is not +`tcp+tls`. -`syslog-tls-cert` specifies the absolute path to the TLS certificate file. +`syslog-tls-cert` specifies the absolute path to the TLS certificate file. This +option is ignored if the address protocol is not `tcp+tls`. + +`syslog-tls-key` specifies the absolute path to the TLS key file. This option +is ignored if the address protocol is not `tcp+tls`. + +`syslog-tls-skip-verify` configures the TLS verification. This verification is +enabled by default, but it can be overriden by setting this option to `true`. This option is ignored if the address protocol is not `tcp+tls`. -`syslog-tls-key` specifies the absolute path to the TLS key file. -This option is ignored if the address protocol is not `tcp+tls`. - -`syslog-tls-skip-verify` configures the TLS verification. -This verification is enabled by default, but it can be overriden by setting -this option to `true`. This option is ignored if the address protocol is not `tcp+tls`. - By default, Docker uses the first 12 characters of the container ID to tag log messages. Refer to the [log tag option documentation](log_tags.md) for customizing the log tag format. @@ -137,34 +162,40 @@ If not specified it defaults to the local unix syslog format without hostname sp Specify rfc3164 to perform logging in RFC-3164 compatible format. Specify rfc5424 to perform logging in RFC-5424 compatible format - ## journald options -The `journald` logging driver stores the container id in the journal's `CONTAINER_ID` field. For detailed information on -working with this logging driver, see [the journald logging driver](journald.md) -reference documentation. +The `journald` logging driver stores the container id in the journal's +`CONTAINER_ID` field. For detailed information on working with this logging +driver, see [the journald logging driver](journald.md) reference documentation. -## gelf options +## GELF options The GELF logging driver supports the following options: - --log-opt gelf-address=udp://host:port - --log-opt tag="database" - --log-opt labels=label1,label2 - --log-opt env=env1,env2 - --log-opt gelf-compression-type=gzip - --log-opt gelf-compression-level=1 +```bash +--log-opt gelf-address=udp://host:port +--log-opt tag="database" +--log-opt labels=label1,label2 +--log-opt env=env1,env2 +--log-opt gelf-compression-type=gzip +--log-opt gelf-compression-level=1 +``` The `gelf-address` option specifies the remote GELF server address that the -driver connects to. Currently, only `udp` is supported as the transport and you must -specify a `port` value. The following example shows how to connect the `gelf` -driver to a GELF remote server at `192.168.0.42` on port `12201` +driver connects to. Currently, only `udp` is supported as the transport and you +must specify a `port` value. The following example shows how to connect the +`gelf` driver to a GELF remote server at `192.168.0.42` on port `12201` - $ docker run --log-driver=gelf --log-opt gelf-address=udp://192.168.0.42:12201 +```bash +$ docker run -dit \ + --log-driver=gelf \ + --log-opt gelf-address=udp://192.168.0.42:12201 \ + alpine sh +``` -By default, Docker uses the first 12 characters of the container ID to tag log messages. -Refer to the [log tag option documentation](log_tags.md) for customizing -the log tag format. +By default, Docker uses the first 12 characters of the container ID to tag log +messages. Refer to the [log tag option documentation](log_tags.md) for +customizing the log tag format. The `labels` and `env` options are supported by the gelf logging driver. It adds additional key on the `extra` fields, prefixed by an @@ -179,14 +210,15 @@ The `gelf-compression-type` option can be used to change how the GELF driver compresses each log message. The accepted values are `gzip`, `zlib` and `none`. `gzip` is chosen by default. -The `gelf-compression-level` option can be used to change the level of compresssion -when `gzip` or `zlib` is selected as `gelf-compression-type`. Accepted value -must be from from -1 to 9 (BestCompression). Higher levels typically -run slower but compress more. Default value is 1 (BestSpeed). +The `gelf-compression-level` option can be used to change the level of +compresssion when `gzip` or `zlib` is selected as `gelf-compression-type`. +Accepted value must be from from -1 to 9 (BestCompression). Higher levels +typically run slower but compress more. Default value is 1 (BestSpeed). -## fluentd options +## Fluentd options -You can use the `--log-opt NAME=VALUE` flag to specify these additional Fluentd logging driver options. +You can use the `--log-opt NAME=VALUE` flag to specify these additional Fluentd +logging driver options. - `fluentd-address`: specify `host:port` to connect [localhost:24224] - `tag`: specify tag for `fluentd` message @@ -197,7 +229,13 @@ You can use the `--log-opt NAME=VALUE` flag to specify these additional Fluentd For example, to specify both additional options: -`docker run --log-driver=fluentd --log-opt fluentd-address=localhost:24224 --log-opt tag=docker.{{.Name}}` +```bash +$ docker run -dit \ + --log-driver=fluentd \ + --log-opt fluentd-address=localhost:24224 \ + --log-opt tag="docker.{{.Name}}" \ + alpine sh +``` If container cannot connect to the Fluentd daemon on the specified address and `fluentd-async-connect` is not enabled, the container stops immediately. @@ -205,42 +243,51 @@ For detailed information on working with this logging driver, see [the fluentd logging driver](fluentd.md) -## Specify Amazon CloudWatch Logs options +## Amazon CloudWatch Logs options The Amazon CloudWatch Logs logging driver supports the following options: - --log-opt awslogs-region= - --log-opt awslogs-group= - --log-opt awslogs-stream= +```bash +--log-opt awslogs-region= +--log-opt awslogs-group= +--log-opt awslogs-stream= +``` - -For detailed information on working with this logging driver, see [the awslogs logging driver](awslogs.md) reference documentation. +For detailed information on working with this logging driver, see [the awslogs +logging driver](awslogs.md) reference documentation. ## Splunk options The Splunk logging driver requires the following options: - --log-opt splunk-token= - --log-opt splunk-url=https://your_splunk_instance:8088 +```bash +--log-opt splunk-token= +--log-opt splunk-url=https://your_splunk_instance:8088 +``` -For detailed information about working with this logging driver, see the [Splunk logging driver](splunk.md) -reference documentation. +For detailed information about working with this logging driver, see the +[Splunk logging driver](splunk.md) reference documentation. ## ETW logging driver options -The etwlogs logging driver does not require any options to be specified. This logging driver will forward each log message -as an ETW event. An ETW listener can then be created to listen for these events. +The etwlogs logging driver does not require any options to be specified. This +logging driver forwards each log message as an ETW event. An ETW listener +can then be created to listen for these events. -For detailed information on working with this logging driver, see [the ETW logging driver](etwlogs.md) reference documentation. +The ETW logging driver is only available on Windows. For detailed information +on working with this logging driver, see [the ETW logging driver](etwlogs.md) +reference documentation. -## Google Cloud Logging +## Google Cloud Logging options The Google Cloud Logging driver supports the following options: - --log-opt gcp-project= - --log-opt labels=, - --log-opt env=, - --log-opt log-cmd=true +```bash +--log-opt gcp-project= +--log-opt labels=, +--log-opt env=, +--log-opt log-cmd=true +``` -For detailed information about working with this logging driver, see the [Google Cloud Logging driver](gcplogs.md). -reference documentation. +For detailed information about working with this logging driver, see the +[Google Cloud Logging driver](gcplogs.md). reference documentation. diff --git a/docs/admin/logging/splunk.md b/docs/admin/logging/splunk.md index 9c60a529d2..b5f60f3450 100644 --- a/docs/admin/logging/splunk.md +++ b/docs/admin/logging/splunk.md @@ -6,7 +6,6 @@ description = "Describes how to use the Splunk logging driver." keywords = ["splunk, docker, logging, driver"] [menu.main] parent = "smn_logging" -weight = 2 +++ From 785e38d57bb9e0a08be73a565e13e53c3e480273 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 2 Jun 2016 17:05:32 +0200 Subject: [PATCH 06/12] Merge pull request #23179 from kerneltime/master Add VMware Docker Volume Plugin. (cherry picked from commit 09033b8df223c3d3ea1fc97bc86cd6f23e1cdfc3) Signed-off-by: Sebastiaan van Stijn --- docs/extend/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/extend/plugins.md b/docs/extend/plugins.md index fe80ac6d98..222a2dbf65 100644 --- a/docs/extend/plugins.md +++ b/docs/extend/plugins.md @@ -65,6 +65,7 @@ Plugin [OpenStorage Plugin](https://github.com/libopenstorage/openstorage) | A cluster-aware volume plugin that provides volume management for file and block storage solutions. It implements a vendor neutral specification for implementing extensions such as CoS, encryption, and snapshots. It has example drivers based on FUSE, NFS, NBD and EBS to name a few. [Quobyte Volume Plugin](https://github.com/quobyte/docker-volume) | A volume plugin that connects Docker to [Quobyte](http://www.quobyte.com/containers)'s data center file system, a general-purpose scalable and fault-tolerant storage platform. [REX-Ray plugin](https://github.com/emccode/rexray) | A volume plugin which is written in Go and provides advanced storage functionality for many platforms including VirtualBox, EC2, Google Compute Engine, OpenStack, and EMC. +[VMware vSphere Storage Plugin](https://github.com/vmware/docker-volume-vsphere) | Docker Volume Driver for vSphere enables customers to address persistent storage requirements for Docker containers in vSphere environments. ### Authorization plugins From af3b1fbcbcd6e0c1363523bb2aa4da64e44b579a Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Thu, 2 Jun 2016 18:05:49 -0700 Subject: [PATCH 07/12] Merge pull request #23192 from orsenthil/docfixes/ubuntu_install Fix the docker daemon restart command for ubuntu. (cherry picked from commit e2528712db8b904de0ae7c076a3ddcf163a2734d) Signed-off-by: Sebastiaan van Stijn --- docs/installation/linux/ubuntulinux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/linux/ubuntulinux.md b/docs/installation/linux/ubuntulinux.md index 1807874c12..4371135a8b 100644 --- a/docs/installation/linux/ubuntulinux.md +++ b/docs/installation/linux/ubuntulinux.md @@ -391,7 +391,7 @@ To specify a DNS server for use by Docker: 5. Restart the Docker daemon. - $ sudo restart docker + $ sudo service docker restart   From 650ddc1f817ae7f07dcc8adce60c298c198ee0ee Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Thu, 2 Jun 2016 18:45:08 -0700 Subject: [PATCH 08/12] Merge pull request #23193 from allencloud/fix-typos use grep to find all a/an typos (cherry picked from commit 98c245c9e63793cf8ca03c5500e0820447c1861c) Signed-off-by: Sebastiaan van Stijn --- CHANGELOG.md | 2 +- CONTRIBUTING.md | 6 +++--- docs/admin/configuring.md | 2 +- docs/admin/logging/fluentd.md | 2 +- docs/admin/systemd.md | 2 +- docs/examples/running_redis_service.md | 2 +- docs/installation/linux/fedora.md | 2 +- docs/installation/windows.md | 2 +- docs/reference/api/docker_remote_api_v1.20.md | 2 +- docs/reference/api/docker_remote_api_v1.21.md | 2 +- docs/reference/api/docker_remote_api_v1.22.md | 2 +- docs/reference/api/docker_remote_api_v1.23.md | 2 +- docs/reference/commandline/attach.md | 2 +- docs/reference/commandline/daemon.md | 4 ++-- docs/reference/commandline/pull.md | 2 +- docs/security/https.md | 2 +- docs/security/trust/content_trust.md | 2 +- docs/security/trust/trust_delegation.md | 2 +- docs/security/trust/trust_key_mng.md | 2 +- docs/userguide/intro.md | 2 +- man/docker-attach.1.md | 2 +- man/docker-inspect.1.md | 2 +- man/docker-run.1.md | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed87168992..561f169d98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1686,7 +1686,7 @@ With the ongoing changes to the networking and execution subsystems of docker te + Add -rm to docker run for removing a container on exit - Remove error messages which are not actually errors - Fix `docker rm` with volumes -- Fix some error cases where a HTTP body might not be closed +- Fix some error cases where an HTTP body might not be closed - Fix panic with wrong dockercfg file - Fix the attach behavior with -i * Record termination time in state. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6b875d6901..385833720d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -152,9 +152,9 @@ However, there might be a way to implement that feature *on top of* Docker. Docker-user is for people using Docker containers. The docker-dev - group is for contributors and other people contributing to the Docker - project. - You can join them without an google account by sending an email to e.g. "docker-user+subscribe@googlegroups.com". + group is for contributors and other people contributing to the Docker project. + You can join them without a google account by sending an email to + docker-dev+subscribe@googlegroups.com. After receiving the join-request message, you can simply reply to that to confirm the subscribtion. diff --git a/docs/admin/configuring.md b/docs/admin/configuring.md index e7556ab729..b91ed8203e 100644 --- a/docs/admin/configuring.md +++ b/docs/admin/configuring.md @@ -48,7 +48,7 @@ Some of the daemon's options are: | `--tls=false` | Enable or disable TLS. By default, this is false. | -Here is a an example of running the `docker` daemon with configuration options: +Here is an example of running the `docker` daemon with configuration options: $ docker daemon -D --tls=true --tlscert=/var/docker/server.pem --tlskey=/var/docker/serverkey.pem -H tcp://192.168.59.3:2376 diff --git a/docs/admin/logging/fluentd.md b/docs/admin/logging/fluentd.md index 21d4b74c56..238bd06a40 100644 --- a/docs/admin/logging/fluentd.md +++ b/docs/admin/logging/fluentd.md @@ -89,7 +89,7 @@ and [its documents](http://docs.fluentd.org/). To use this logging driver, start the `fluentd` daemon on a host. We recommend that you use [the Fluentd docker image](https://hub.docker.com/r/fluent/fluentd/). This image is -especially useful if you want to aggregate multiple container logs on a each +especially useful if you want to aggregate multiple container logs on each host then, later, transfer the logs to another Fluentd node to create an aggregate store. diff --git a/docs/admin/systemd.md b/docs/admin/systemd.md index ef44e8e9ee..03283cce8d 100644 --- a/docs/admin/systemd.md +++ b/docs/admin/systemd.md @@ -123,7 +123,7 @@ If you fail to specify an empty configuration, Docker reports an error such as: This example overrides the default `docker.service` file. -If you are behind a HTTP proxy server, for example in corporate settings, +If you are behind an HTTP proxy server, for example in corporate settings, you will need to add this configuration in the Docker systemd service file. First, create a systemd drop-in directory for the docker service: diff --git a/docs/examples/running_redis_service.md b/docs/examples/running_redis_service.md index 82daaa7830..66d852206e 100644 --- a/docs/examples/running_redis_service.md +++ b/docs/examples/running_redis_service.md @@ -1,7 +1,7 @@