Commit Graph

5282 Commits

Author SHA1 Message Date
499b99fb58 Merge pull request #22570 from mountkin/rm-deprecated-feature
remove deprecated feature of passing HostConfig at API container start
Upstream-commit: 4b86651053d92429ee2a73abd2d815a5d4c936a1
Component: engine
2016-06-01 18:24:28 +02:00
5934bb4c2f Merge pull request #23165 from thaJeztah/update-logging-code-hints
cleanup logging driver documentation
Upstream-commit: 8d75709f90ba9926d41cd7b91bb316e336af8f8c
Component: engine
2016-06-01 17:55:24 +02:00
67d0b2dc23 remove deprecated feature of passing HostConfig at API container start
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 0a8386c8be3fa87b7523bef7fd31c81a7f84709c
Component: engine
2016-06-01 22:25:17 +08:00
46e46eb95e cleanup logging driver documentation
This does a minor cleanup of the logging driver
documentation;

- Add a table-header to the driver-options
  table.
- Add language hints to code-blocks to
  prevent incorrect highlighting
- Wrap some code examples so that they
  fit in the default layout
- Wrap text to 80-chars
- Fix ordering in menu
- Some minor rewording

We should still create separate pages
for all available drivers (for example,
json-file, syslog, and GELF don't have
their own configuration page)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a9f6d93099283ee06681caae7fe29bd1b2dd4c77
Component: engine
2016-06-01 13:18:25 +02:00
33dcac83e5 Remove status column from client libraries page
They are all "active". If they are not active, we should probably
remove them.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 896fbb470a5fa118039ccbd30c3bffdcc6c461ff
Component: engine
2016-05-31 16:12:14 -07:00
898770c3b7 Update client libraries introduction text
Explain what they actually are.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 2fea5b6e28c6b92ee2e453ad1855d17246d6e08e
Component: engine
2016-05-31 16:11:36 -07:00
b6a3d1bab8 Add the DRBD Docker Volume Plugin to the documentation
Signed-off-by: Roland Kammerer <roland.kammerer@linbit.com>
Upstream-commit: ef238db508f55f70b982a95bb37e79536fe75e4b
Component: engine
2016-05-30 17:46:53 +02:00
801ed1028f Merge pull request #22384 from yongtang/22358-log-tag-prefix
Remove `docker/` prefix from log messages tag.
Upstream-commit: f3a7abee8107eb13e13dfff959998286b87a34ed
Component: engine
2016-05-30 14:48:31 +02:00
ea5d7217d0 Merge pull request #22621 from yongtang/05092016-remove-deprecated-command-line-short-variant-options
Un-deprecated command line short variant options of `-c`
Upstream-commit: 4a031f1f80440cc61b56e5b6e111e155e4da066d
Component: engine
2016-05-27 23:12:08 +02:00
aa60879053 Merge pull request #23060 from friism/add-power-shell-example
Add power shell example
Upstream-commit: 068d466cc7cd4ef3915b983b61e9cd029936ac90
Component: engine
2016-05-27 21:21:32 +02:00
57ccaf383c Add powershell example and make linux build example consistent with other examples
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: ab391c9ab595f01e76b82edda0800e13655cc6f3
Component: engine
2016-05-27 11:49:09 -07:00
8f272a4606 Merge pull request #23039 from yongtang/05262016-docs-cluster-store-opts
Fix error in dockerd.md for incorrect cluster-store-opts example.
Upstream-commit: f1276cd3aa8d2bff6e3ab1ac3a175deeecac405e
Component: engine
2016-05-27 18:55:48 +02:00
815da186d3 Fix error in dockerd.md for incorrect cluster-store-opts example.
This fix fixes an error in documentation (dockerd.md). In the
example given by dockerd.md, the option `cluster-store-opts`
is assigned with an array but this option can only be assigned
as a map.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 32b234885e798650cdff70f0459175e79a294b4d
Component: engine
2016-05-26 20:04:48 -07:00
8607e03463 Fix up stale links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ee7696312580f14ce7b8fe70e9e4cbdc9f83919f
Component: engine
2016-05-27 00:28:46 +00:00
d77d575d98 Merge pull request #22888 from ibuildthecloud/host-compat
Remove DOCKER_HTTP_HOST_COMPAT env var
Upstream-commit: ef89891855e132d3d0e4c92fa041f590c8e8198c
Component: engine
2016-05-26 14:41:22 -07:00
5bcb28804b Merge pull request #22268 from Microsoft/jjh/continuationescape
Support platform semantic file paths through ESCAPE
Upstream-commit: 8e924153e219d040e3aa672df4e0c7baff9f8d8b
Component: engine
2016-05-26 10:00:56 -07:00
2e3f90f2fd Un-deprecated command line short variant options of -c.
Since 1.9, the following short variant options have been
deprecated in favor of their long variants:
`docker run -c (--cpu-shares)`
`docker build -c (--cpu-shares)`
`docker create -c (--cpu-shares)`
`docker update -c (--cpu-shares)`

However, `-c` is still widely used and is considered as
a convenient option for swarm (see #16271).

This fix undeprecated the command line short
variant options of `-c` and updated the deprecated.md.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: fea7acf0e9f0532af7451a3c3835a0cfabf4fb20
Component: engine
2016-05-26 08:22:27 -07:00
06a16bdf54 Merge pull request #22999 from deed02392/master
Update debian.md
Upstream-commit: 215324251aed0df84d0a5a876ccd5a7e537a41a1
Component: engine
2016-05-26 15:37:55 +02:00
0c3fa0e2e7 Update debian.md
Updated documents markdown file on Debian installation.
Added details on the fact that backports are necessary on Wheezy as discussed in issue #16878

Signed-off-by: George Hafiz <george@hafiz.uk>
Upstream-commit: 6c5f724560d3e1c47c927fa39056cd32de9f0890
Component: engine
2016-05-26 13:47:19 +01:00
ce0de1f301 Fix URLs for official Oracle installation guide.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 7711c842be52cd753c13a50594da301f2158ddae
Component: engine
2016-05-26 07:40:01 +10:00
0dfa27aea9 update link to hub plans
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3d782cdbffd4b8bddbc8f63e3a0b762224a5d3c3
Component: engine
2016-05-25 23:01:13 +02:00
9d83880bc6 Merge pull request #22986 from SvenDowideit/add-make-test
Add make test and other small cleanups
Upstream-commit: 4746864c2b405bcb2526df20d572b9de9df7f3b1
Component: engine
2016-05-25 21:03:59 +02:00
5eadce41df Merge pull request #22987 from Microsoft/jjh/labeldocs
Docs: Label clarification
Upstream-commit: bb80563a8123824bed23c36698e6fa01317bbe5f
Component: engine
2016-05-25 20:56:54 +02:00
6679d6d042 Merge pull request #22661 from SvenDowideit/update-compatibility-matrix
docs: update graphdriver compatibility matrix
Upstream-commit: a5e4aaaf71cad9e4f57b50d92297d74c515b6c6d
Component: engine
2016-05-25 20:48:39 +02:00
1031d8bb5e Docs: Label clarification
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b2643b6953e59549eba8af51a7e783a3e4cebc46
Component: engine
2016-05-25 11:48:07 -07:00
7098114aac docs: update graphdriver compatibility matrix
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a7bf4e4832c216bdbc9fc678262bcd2c081e914b
Component: engine
2016-05-25 18:33:45 +00:00
abd6ce8179 Add make test and other small cleanups
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ad538f6465776281550a7e40b59d5eb6f706b777
Component: engine
2016-05-25 18:30:01 +00:00
0635a7e10b Merge pull request #22908 from vdemeester/7967-since-before-image-filters
Add before and since filter to images
Upstream-commit: 0fe4417a3b2c18714303f319224b74ec08674115
Component: engine
2016-05-25 20:15:23 +02:00
e0c1ae90e0 Merge pull request #22968 from mbentley/fix-dm-docs
Fixed lost thin pool devicemapper docs
Upstream-commit: 5bd6067b85cdaa80cfbd43648f9b0a57e1cf58b9
Component: engine
2016-05-25 16:40:52 +02:00
e79985ff9b Re-apply changes made in 24ec73f
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: 0b8ea4387a3b1e415a49b9c6dbead858891a5ce9
Component: engine
2016-05-25 08:46:39 -04:00
0f6a9d4e70 Fix thin pool devicemapper docs overwritten
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: 79205c3f061c4b690a459cb2b08b6a7df7af327c
Component: engine
2016-05-25 08:45:51 -04:00
9fc37c22c9 Add before and since filter to images
Add support for two now filter on the `images` command : `before` and
`since`. They work the same as the one on the `ps` command but for
images.

        $ docker images --filter before=myimage
        # display all images older than myimage
        $ docker images --filter since=myimage
        # display all images younger than myimage

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 750e16f57c0121aa8cdad1763f0bb6e54b8c6d75
Component: engine
2016-05-25 13:49:10 +02:00
b520646fdd The option --add-host and --net=host should not be mutually exclusive.
This fix tries to address the issue raised in #21976 and allows
the options of `--add-host` and `--net=host` to work at the same time.

The documentation has been updated and additional tests have been
added to cover this change.

This fix fixes #21976.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 90bd41a74d57080711678bffa2bc4371020ee3a5
Component: engine
2016-05-24 18:49:11 -07:00
e230ff1485 The option --dns, --dns-search, --dns-opt and --net=host should not be mutually exclusive.
This fix tries to address the issue raised in #21976 and allows
the options of `--dns`, `--dns-search`, `--dns-opt` and `--net=host`
to work at the same time.

The documentation has been updated and additional tests have been
added to cover this change.

This fix fixes #21976.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 23821fe5867427fa36c265bc994b1a2c3cf9b21f
Component: engine
2016-05-24 16:03:26 -07:00
eaeb1bdc9d Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md
Fix incorrectly named "ip-mask" and "api-cors-headers" options
Upstream-commit: f0d6fd93a2b2cbe4ad177524ca52018dae2fcce7
Component: engine
2016-05-24 18:21:52 +02:00
6696b4b541 Merge pull request #22906 from nshalman/patch-1
Clarification about 'docker build --build-arg'
Upstream-commit: ce07eac570e90ed8aa69472bae463902c075e078
Component: engine
2016-05-24 15:33:27 +02:00
2332228518 Clarification about 'docker build --build-arg'
See #22860

Signed-off-by: Nahum Shalman <nshalman@omniti.com>
Upstream-commit: fd7d99ed283bea260fa5e674ee8200038196fdac
Component: engine
2016-05-24 09:25:11 -04:00
df271497b6 Merge pull request #22900 from AkihiroSuda/fix22020
update docs/reference/commandline/cp.md
Upstream-commit: 6a385a00226dc7d8a35406ae284bb6731444d524
Component: engine
2016-05-24 14:06:02 +02:00
4e2b010c12 update docs/reference/commandline/cp.md
Close #22020

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: cb1635c9cf4813c95a1c72dd35b13e8acebfbfb6
Component: engine
2016-05-24 11:09:38 +00:00
850246a4c4 Merge pull request #22590 from yongtang/22463-docker-daemon-events
Emit events for docker daemon
Upstream-commit: d76d38c7d028754c48f842e4631c2d897e63198d
Component: engine
2016-05-24 11:05:39 +02:00
b1cf67eeb6 remove duplicated text
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 5271a69411e93a2b694c84f7f8216f0d91404e07
Component: engine
2016-05-23 19:01:30 -07:00
fe4d79b993 Add filter for events emitted by docker daemon
This fix tries to cover the issue raised in #22463 by adding
filter for events emitted by docker daemon so that user could
utilize filter to receive events of interest.

Documentations have been updated for this fix.

Additional tests have been added to cover the changes in this fix.

This fix fixes #22463.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 62014aaf9abeb4256cb66e7ae06bfdf5a77d1140
Component: engine
2016-05-23 19:00:47 -07:00
e954a0d7e9 Emit events for docker daemon
This fix tries to cover the issue raised in #22463 by emitting
events for docker daemon so that user could be notified by
scenarios like config reload, etc.

This fix adds the `daemon reload`, and events for docker daemon.

Additional tests have been added to cover the changes in this fix.

This fix fixes #22463.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 382c152a73dfa1d771334ffbe79759c5c3596144
Component: engine
2016-05-23 19:00:47 -07:00
0fa6812f20 Merge pull request #22665 from isubuz/20788-doc-valid-tag-name
docs: add valid chars in image name and tag 
Upstream-commit: 2cd8b876ad1c235ccd932d101252423fa86aee06
Component: engine
2016-05-23 20:45:27 +02:00
af7458f4ff Merge pull request #22774 from Microsoft/jjh/client
Windows: Daemon default to Hyper-V containers on client
Upstream-commit: 9f1a1212593e8e9ca4fcdeeaabc09e0deee8e806
Component: engine
2016-05-23 11:29:50 -07:00
ebe14ff3b5 fix docs not building if branch-name contains slashes
similar to the changes made in a4192471cd6d6012a66c19a635a11c7f6139d683,
clean the branch-name before using it as a tag-name
for the image that's built.

this also changes the "image name" for docs images
being built from "docs-base" to "docker-docs", to
be in line with the main Makefile

before this change:

  /usr/bin/make -C docs docs
  docker build -t "docs-base:docs/slashes" .
  invalid value "docs-base:docs/slashes" for flag -t: Error parsing reference: "docs-base:docs/slashes" is not a valid repository/tag
  See 'docker build --help'.
  make[1]: *** [docs-build] Error 125
  make: *** [docs] Error 2

after this change:

  /usr/bin/make -C docs docs
  docker build -t "docker-docs:docs-slashes" .
  Sending build context to Docker daemon 9.165 MB
  ...

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9552e24af6151eaef07a481a1125059141d01f75
Component: engine
2016-05-22 17:33:41 +02:00
d17ab45ce6 Remove DOCKER_HTTP_HOST_COMPAT env var
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 989f6f852f639404f8e86e179ce5389e2d29c5d2
Component: engine
2016-05-21 21:32:00 -07:00
45541eb90b Fix a typos in docs of networking guide
This fix fixes a typo in the documentation (`dockernetworks.md`)
of networking user guide.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 55b172401851a6338a325ef7930d50ace9efb067
Component: engine
2016-05-21 13:19:05 -07:00
d83ba877bb Document valid chars in image name and tag
- Add link to valid image name and tag formats in referenced files
- Per review comments, updated docs to remove reference to `USERNAME` and
`REGISTRYHOST`.
- Per review comment, removed links from man page.
- Per review comment, added and updated examples on `docker tag`

Signed-off-by: Subhajit Ghosh <isubuz.g@gmail.com>
Upstream-commit: ea98cf74aad3c2633268d5a0b8a2f80b331ddc0b
Component: engine
2016-05-21 19:49:19 +01:00
8a34f4db20 Windows: Default to Hyper-V Containers on client
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ef2db56bcf73b3962548a474bbd4469d26f2c655
Component: engine
2016-05-21 11:29:53 -07:00