Commit Graph

3876 Commits

Author SHA1 Message Date
9093f9669d Merge pull request #14981 from calavera/bump_api_version
Bump api version to 1.21.
Upstream-commit: 912bafcf3636ce1de242177a144c727e965b97be
Component: engine
2015-07-27 10:17:24 -07:00
56f08785e1 Merge pull request #14988 from ChanderG/master
Fix minor typo in Debian installation docs
Upstream-commit: f0f753d70aee870a1d5b2c5638b1ead108353100
Component: engine
2015-07-27 09:51:58 -07:00
a4c7971630 Bump api version to 1.21.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0eb88a0751365050cb177e16196622fd1d322efc
Component: engine
2015-07-27 09:48:47 -07:00
d4728ca93c Merge pull request #15007 from cles/arch-systemd-network-issue
Add arch install docs warning about systemd-network
Upstream-commit: 6c0c6b120ac4ea05301b584c3b84f7e875f542e6
Component: engine
2015-07-27 09:22:01 -07:00
264f05bb5c Merge pull request #14987 from vdemeester/fix-cli-import-docs
Add missing documentation to cli/import.md
Upstream-commit: a65f7acbbf5e543c9389ff0497eb966fefc00f1d
Component: engine
2015-07-27 09:19:57 -07:00
b39a60e323 much improved wording for manual network config setup on arch install docs by @moxiegirl
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
Upstream-commit: 26fa9b0d0d23700ba87aba7862fcf2baa5c26f1e
Component: engine
2015-07-26 19:11:27 +02:00
1e7a75140d Add missing documentation to cli/import.md
PR #11907 added support for import using file (path), but it missed
the update of cli/import.md. This fixes that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3101941120db54dde89933d76d3ea23c4bde0f7c
Component: engine
2015-07-26 18:39:42 +02:00
624235bebb Fix typo
Signed-off-by: John Tims <john.k.tims@gmail.com>
Upstream-commit: 7b552c7a3782d2cb8270c5c3ca05d7b34b1ea407
Component: engine
2015-07-26 10:53:07 -04:00
0560ee0b45 Change of wording, rearrange section ordering
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
Upstream-commit: e1b57b2a87a763fc9fac5fbd59f64dcf1e541e7e
Component: engine
2015-07-26 13:27:35 +02:00
a41b93c9fb Add arch install docs warning about systemd-network
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
Upstream-commit: 6bd15a68cf59043e05bd69fccbafcfed25d7c22e
Component: engine
2015-07-26 13:27:07 +02:00
29208c0bdb Merge pull request #15004 from charleswhchan/patch-2
Update faq.md
Upstream-commit: 5297a25b4eabb0bd6b76a09ea8f63d3e18329243
Component: engine
2015-07-26 13:03:45 +02:00
10ca606a3c Fix typo in JSON config example, in the CLI documetation
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com>
Upstream-commit: 09a9958e22640e1bcfec1c0c274a8c42ebc88b4a
Component: engine
2015-07-26 12:09:31 +02:00
6591e5b614 Update faq.md
Fix case for PostgreSQL.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: c6816dfc677a639361320274760d956eea200a29
Component: engine
2015-07-25 22:03:20 -07:00
a56deec7d3 Fix minor typo in Debian installation docs
Signed-off-by: Chander G <chandergovind@gmail.com>
Upstream-commit: ceeb22dc6e341da413926a5f972d54f5a3ca8715
Component: engine
2015-07-26 03:49:18 +05:30
4f2862dc8f Merge pull request #14546 from dmcgowan/trusted-notary-integration
Notary integration
Upstream-commit: 4f5b677fd9808b34382061c458e13d3930516889
Component: engine
2015-07-24 17:44:14 -07:00
99a373ceb8 Rename to flags and environment variables to content trust
Update help line to allow 90 characters instead of 80

The trust flag pushes out the help description column wider, requiring more room to display help messages.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 259cadb0b19a9049302e78fec529b0105efabb1d
Component: engine
2015-07-24 16:31:18 -07:00
674470f5c3 Merge pull request #14637 from metalivedev/patch-1
Document that load supports compressed tarballs.
Upstream-commit: 86c7ea48632fd86c692ef763d2113b0971325797
Component: engine
2015-07-24 23:38:43 +02:00
a23b513644 Merge pull request #14522 from carlossg/patch-1
Clarify filters option in list containers doc
Upstream-commit: d951ef128fec53478203163166583f7212956215
Component: engine
2015-07-24 23:13:32 +02:00
3ccb4575e6 Merge pull request #14939 from rtrauntvein/docs-autobuild
Fix broken link in automated build doc
Upstream-commit: 2b847df8c2d06f91cb8969eebc3bb861de184c9c
Component: engine
2015-07-24 13:48:14 -07:00
9bb78c67ff Merge pull request #14877 from calavera/deprecate_docker_d
Add -d to the deprecated feature list for 1.8.
Upstream-commit: f32295eda62192916637d24fe7e3d987c2bc4236
Component: engine
2015-07-24 17:44:23 +02:00
87314dfb81 Clarify filters option in list containers and list images docs
Based on the list containers with filters options it would seem that filtering containers with label `test=docker-java` could be done with `{"test":["docker-java"]}` which doesn't work

The options that work are `{"label":["test"]}` and `{"label":["test=docker-java"]}`

As seen in https://github.com/docker-java/docker-java/pull/262

Signed-off-by: Carlos Sanchez <carlos@apache.org>
Upstream-commit: 1fb29e6c3c13127912d1de9233f2aaaf63ec0ee8
Component: engine
2015-07-24 11:57:18 +02:00
ffb11d4bf7 Add cmdline docs for signing and verification flows
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
Upstream-commit: 48250832a3dd4b93ee7f61035b5b8176febfb55f
Component: engine
2015-07-24 01:31:50 -07:00
fd5b332b83 Merge pull request #14700 from charleswhchan/patch-2
Add benefit to using automated build.
Upstream-commit: 58bab11ee298db92fa7db9c99d058b92d58fed54
Component: engine
2015-07-24 08:22:59 +02:00
a375cbd8f0 Fix broken link in automated build doc
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
Upstream-commit: 8e66e627d701101e583c31fba419b0ae8cf2fb89
Component: engine
2015-07-23 23:12:06 -07:00
f574cabfab * Add benefit to using automated build.
* Wording based on suggestions by @thaJeztah, @moxiegirl in PR #14700.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: c9ff01ffc74c04d07933118d6275674bdd514c71
Component: engine
2015-07-23 21:01:23 -07:00
fa96a081c8 Merge pull request #13771 from tiborvass/daemon-cli
New `docker daemon` command
Upstream-commit: 7674f2168642f0c9012e20db8ac27ce09ecb2983
Component: engine
2015-07-23 19:30:39 -07:00
3e3c660339 Merge pull request #14696 from rtrauntvein/patch-1
Fix link to examples documentation
Upstream-commit: 163acd07e24a15fb96face9395f9283a47cd3e2f
Component: engine
2015-07-23 18:25:31 -07:00
fbf6d59e07 Update docs to use the new docker daemon command
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e246f1e4eec3290f343627e73a926b940b77b121
Component: engine
2015-07-23 20:31:43 -04:00
07938abda9 Add index.md to examples docs
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
Upstream-commit: 4f62dec548f47634e75ef9a0238de2bddc5bee33
Component: engine
2015-07-23 17:24:44 -07:00
bbca49004b Merge pull request #14557 from maaquib/14418-dangling-link-in-runmd
Fixing dangling link in docs/reference/commandline/run.md
Upstream-commit: 490e78a642492f25d6c0f7cf1ee855b192d323c7
Component: engine
2015-07-23 16:29:17 -07:00
bf29f91881 Merge pull request #14589 from paetling/ae-update_net_docs
add to docs that ports do not get exposed when using --net
Upstream-commit: ae027c08642621877a93187c0f2b0451df8b71fd
Component: engine
2015-07-23 16:22:21 -07:00
6a78a43641 Merge pull request #14900 from duglin/AddFilterToDoc
Add filter to /images/json docs
Upstream-commit: 4e035031b03da375a58bac2263a5eff8ea1acf1a
Component: engine
2015-07-23 11:57:12 -07:00
b1387e7404 Add filter to /images/json docs
Closes #14894

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a20bf5e61c542fea377345d5318293b44c65cbb5
Component: engine
2015-07-23 05:29:09 -07:00
f367cae014 Fix typo in builder.mb .dockerignore example
Signed-off-by: jgeiger <jgeiger@gmail.com>
Upstream-commit: 9086c16f4283e330361ec9621781f6315fe3467f
Component: engine
2015-07-22 23:54:46 -06:00
c3fd734293 Merge pull request #14886 from duglin/FixDepDoc
Fix typo in deprecation doc
Upstream-commit: c5053d4700379e6bd46b498b8559f5be88c8c1a2
Component: engine
2015-07-22 23:15:09 -04:00
Lei
b278b668e9 Add ulimit to docker build.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 877dbbbde8aaf6583a81d9946e4c83db8e356b1a
Component: engine
2015-07-23 10:26:06 +08:00
6983345fdd Fix typos in deprecation doc
thanks @tiborvass

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ea3dcee913d5c76984354340239f97a725035e88
Component: engine
2015-07-22 18:45:12 -07:00
6f661b9f5c Merge pull request #14580 from rohitkadam19/patch-1
Update docker_remote_api_v1.17.md
Upstream-commit: a3857cc3799e2a92b92f07842c03b442490f01ab
Component: engine
2015-07-22 19:22:37 -04:00
8cd4fb4243 Merge pull request #14638 from jfrazelle/new-repo-install-script
update install script/docs for new apt and yum repos
Upstream-commit: f21819275470b8a3ec6915fa59f386be44371356
Component: engine
2015-07-22 15:25:27 -07:00
56865b2a68 update docs for new install script
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 877d740d4837c67030458254db80aea3869989b1
Component: engine
2015-07-22 15:08:14 -07:00
bc0fcbdbf0 Add -d to the deprecated feature list for 1.8.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9a1728a427288587fe79dab4537474f6af301a9c
Component: engine
2015-07-22 15:05:23 -07:00
4ecc8c2651 Define Docker's deprecation policy
Announce the cmd line options that are targetted for removal

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 27b828c9e4430e432380bae4962a366c22228823
Component: engine
2015-07-22 14:09:49 -07:00
0f4c6539ee Merge pull request #14769 from clintonskitson/add_plugindocs_rexray
updated plugin docs to include REX-Ray
Upstream-commit: d3ba2457d92e0aa763723d632ec9ac9048aa66b9
Component: engine
2015-07-22 22:12:41 +02:00
90d69c37a6 Merge pull request #14799 from coolljt0725/docs_fix_devicemapper_default_basesize
Docs: update the devicemapper default basesize from 10G to 100G
Upstream-commit: 933d9f2e0d61345a11f272487a223f4085bb798a
Component: engine
2015-07-22 22:07:38 +02:00
ec7391b794 Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader
Refactor log driver reader
Upstream-commit: 1c6fe58efc413b606b6b24e42584ca14be2d1ca8
Component: engine
2015-07-22 11:54:35 -07:00
b066063905 Merge pull request #14699 from estesp/docker-ps-format
Carry #10255: Docker ps format
Upstream-commit: 40b922418cd48f8b414d8e10fdd72ed2095697e1
Component: engine
2015-07-22 10:58:34 -07:00
e60763fbc1 ps --format: Add config.js doc, fix gofmt, add integration tests
Re-add the docs from @calavera's PR to the moved cli cmd reference docs.
Fix gofmt and vet issues from carried commits
Add integration test for using format with --no-trunc and multi-names
Fix custom_test map order dependency on expected value check
Add docs to reference/commandline/ps.md
Remove "-F" flag option from original carried PR content

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 542b58d8f7a2ff3b78a71b7d2c3145dd79f1fa97
Component: engine
2015-07-22 12:51:16 -04:00
6fe7577ea8 Merge pull request #14217 from ankushagarwal/ubuntu-15.04
Add support for 15.04, add systemd note for 15.04
Upstream-commit: 7d8859a4f54ce86b368860890f9167b910827023
Component: engine
2015-07-22 08:56:02 -07:00
2d8d0361a7 Merge pull request #13711 from calavera/version_volumes_inspect
Expose new mount points structs in inspect.
Upstream-commit: 50d2597e490c4636ee8cacabf34bb9ed3e21d3fc
Component: engine
2015-07-22 09:02:00 +02:00
571c42191c added REX-Ray as volume plugin to plugin docs
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
Upstream-commit: ca552a953e0b7551f710b102454baefd3c450122
Component: engine
2015-07-21 21:00:27 -05:00