Commit Graph

5069 Commits

Author SHA1 Message Date
ceda4e4efa Merge pull request #21712 from yongtang/21335-docs-container-with-volumes
Remote API docs give incorrect example for creating a container with volumes.
Upstream-commit: 3d800dc0192d0d246b0c1888bbe94aca5d52e1d2
Component: engine
2016-04-06 10:15:37 -07:00
7d665b791e Merge pull request #21799 from coolljt0725/fix_docs
Correct the description of --group-add in run.md
Upstream-commit: bbcbed3b54ca5e1ed4f23bb4bf58397e8f7d645b
Component: engine
2016-04-06 10:02:32 -07:00
d8939e35f7 Correct the description of --group-add in run.md
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9a7f2e726885386f57d115f8652b0ae87b20dce6
Component: engine
2016-04-06 21:52:10 +08:00
09c84ecb5a make the cache miss clear
Signed-off-by: mikelinjie <294893458@qq.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 66b8714da4e92b3587cbbf25116541f4de63169e
Component: engine
2016-04-06 00:48:21 -07:00
fc217ad034 Use 'null' instead of 'nil' for json
When describe json response, 'null' is better than 'nil' which is not in
json specification.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: 2f69d7689dcb2ed95093599f0acef7d5445f83b0
Component: engine
2016-04-06 16:13:48 +09:00
e0605e5ec1 Remote API docs give incorrect example for creating a container with volumes.
This fix tries to address the issue mentioned in Docker Remote API where
the examples for creating a container (`POST /containers/create`) with
volumes were incorrect. In the previous remote API document, the `Mounts`
fields was used for volume creation yet since v1.20 `Volumes` should be
used.

This fix fixes #21335.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4ed20402580c4476360736f2bdaa2604dc76cd54
Component: engine
2016-04-02 19:59:02 +00:00
0d08181d47 Merge pull request #20410 from tkopczynski/20236-info-insecure-registry
Add insecure registries to docker info
Upstream-commit: 4a7bd7eaef0038b006cf23adface84081e5aab3b
Component: engine
2016-03-31 16:39:25 -07:00
7215956006 Merge pull request #21688 from mcuadros/patch-1
documentation: adding gce-docker plugin to plugins.md
Upstream-commit: b27f17c9ea03f486fb31f4ce246eeec754f400d9
Component: engine
2016-03-31 07:40:41 -07:00
d4b4130c2f Merge pull request #21681 from senk/21653-api-docs-revisit
Fixed api docs
Upstream-commit: 0d933359623429b301a79874c68b8539dda52d4b
Component: engine
2016-03-31 07:32:57 -07:00
470cd4e96c documentation: adding gce-docker plugin to plugins.md
Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
Upstream-commit: c018018b69771ce1becc71d82e2f912ad55dcde5
Component: engine
2016-03-31 15:22:02 +02:00
1c2036ebf8 Merge pull request #21572 from konstruktoid/systemd_doc
systemctl show, no need to sudo
Upstream-commit: f4b915ad7d72a059e7bba15424e012873b9b49ac
Component: engine
2016-03-31 10:26:28 +02:00
dc335512b1 Merge pull request #21607 from allencloud/change-validateNoSchema-to-validateNoScheme
change validateNoSchema to validateNoScheme
Upstream-commit: e6f2429e017eb3c41bbc77442e81a23635287625
Component: engine
2016-03-31 10:14:23 +02:00
8bd53c59b9 Fixed docs fixes #21653
Fixed some http status codes and decreased site-order for docker_remote_api_v1.24.md to appear in the right order in the menu
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: 5d2f6b3ea3d307c32089757d84c94fab3d8e55d7
Component: engine
2016-03-31 08:39:40 +02:00
58855775ca Add insecure registries to docker info
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 44a50abe7b16368bdc8b70e01cb095dc46cbbbaf
Component: engine
2016-03-31 08:27:24 +02:00
8ae6c0847a 1.change validateNoSchema into validateNoScheme
2.change schema into scheme in docs and some annotations.

Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 28d3c22e55259281c70fd90780a1b0d388450ddf
Component: engine
2016-03-31 12:29:15 +08:00
06ac452012 Merge pull request #21661 from twistlock/client_cert_auth_docs
Add short description about default authentication method in authorization docs
Upstream-commit: ea7d2192e2fedbf9e764a574b48498a95045cc00
Component: engine
2016-03-30 15:18:54 -07:00
d01eb0569f Un-deprecate auto-creation of host directories for mounts
Auto-creation of host-directories was marked deprecated in
Docker 1.9, but was decided to be too much of an backward-incompatible
change, so it was decided to keep the feature.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0f70f53826ac311ca1653827c0d6bc170f300e84
Component: engine
2016-03-30 15:00:09 -07:00
939e159342 Add short description about default authentication method in authorization docs
Following the discussion in #21556, adding a short description of the
default user authentication mechanism (without requiring authentication
plugins)
Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: b2f2f162ad768a1e66d5921146f24bfd0698b302
Component: engine
2016-03-30 21:16:19 +03:00
7450a571b9 Fixed some differences between API and Docs in v1.22,v1.23,v1.24
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: 370dbe0cd98e924e8641a72a437281dd7bce9f3d
Component: engine
2016-03-30 14:04:25 +02:00
e912ffb0bc Merge pull request #21638 from yongtang/21605-docs-Warnings-in-volumes-API
Update documentations for `Warnings` fields in `GET /volumes` API
Upstream-commit: 457eb89bd50ebee912db5cf65cd7332d46d5e27c
Component: engine
2016-03-29 19:11:36 -07:00
93c7f3e4ce Update documentations for Warnings fields in GET /volumes API
This fix updated documentations to add the `Warnings` fields in
`GET /volumes` API.

The `Warnings` has been part of the `GET /volumes` API response
since Docker 1.10 (v1.21). However, the `Warnings` field is not
in the documentation so there are some confusions (See #21606).

This fix updated the related documentations in v1.22, v1.23, and
v1.24 and added this field to the API.

This fix is related to #21605.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d77392798550e47fd3719ad658c6a92d1282d5b2
Component: engine
2016-03-30 01:35:39 +00:00
5888c28b47 Merge pull request #21592 from anusha-ragunathan/docker-systemd
When using systemd, pass expected cgroupsPath and cli options to runc.
Upstream-commit: 99adcaebc0aca57f2665f356e4a9b4218aa5d5f7
Component: engine
2016-03-29 17:00:10 -07:00
3b9321568d When using systemd, pass expected cgroupsPath and cli options to runc.
runc expects a systemd cgroupsPath to be in slice:scopePrefix:containerName
format and the "--systemd-cgroup" option to be set. Update docker accordingly.

Fixes 21475

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 7ed3d265a4499ec03f10537fea0aac3ebaa0cec6
Component: engine
2016-03-29 14:20:10 -07:00
5f7e4a225f Merge pull request #21597 from aaronlehmann/mention-docker-login
Mention "docker login" in push/pull documentation
Upstream-commit: 08db95161a1dc7c5bfe570652d4eb859025a62cb
Component: engine
2016-03-29 09:27:53 +02:00
2a9ea71f8e Merge pull request #21576 from albers/docs-daemon--containerd
docs for `docker daemon --containerd`
Upstream-commit: b9d59e86d35bd2cfba0c77c323b14b05a238eae6
Component: engine
2016-03-29 09:25:16 +02:00
57e1cc77d5 Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli
CLI flag for docker create(run) to change block device size.
Upstream-commit: e6aa40a017e0c11186fb9053b9e71e34b93ebe1c
Component: engine
2016-03-29 08:52:54 +02:00
4afee18d2e Mention "docker login" in push/pull documentation
It was suggested to me that documentation for "docker pull" and "docker
push" should reference "docker login", to make clearer how to specify
credentials for a push or pull operation. Add a note to the manual pages
and reference documentation explaining how registry credentials are
managed.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: fb5ea0c0efec238aeeff7c5c3742a0e4eccff2c7
Component: engine
2016-03-28 17:22:41 -07:00
532443b6b8 Fix a link in the volumes doc to the deprecated doc.
Signed-off-by: Brian Trump <btrump@opselite.org>
Upstream-commit: 02f951b67a889f9bc4fefc602e58efa194d767b7
Component: engine
2016-03-28 16:55:24 -07:00
c4d2d001a2 Merge pull request #21582 from kamigerami/fixes-21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md
fixes-#21581-no--subnetwork-option-as-specified-in-docs
Upstream-commit: 1e1da2a29bf79fadc8a970f4acaa4333723e4880
Component: engine
2016-03-28 16:25:52 -07:00
3002758658 fixes-#21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md: fixed typo in docs
Signed-off-by: kamjar gerami <kami.gerami@gmail.com>
Upstream-commit: a4d4243b9105d03b1e519729e8e8fd4b16084760
Component: engine
2016-03-28 17:02:27 +02:00
9ab7e4327f CLI flag for docker create(run) to change block device size.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: b16decfccfdb0749c490be9272cb7b4789be87b4
Component: engine
2016-03-28 10:05:18 -04:00
9332b48560 docs for docker daemon --containerd
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 75f0015c50fef03067c5d54097fb6eb8cb62200b
Component: engine
2016-03-28 05:40:27 -07:00
40b838beee fix wrong option name in dm.min_free_space examples
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2623b3496ead7c275d2e54bdfcdab0eab528be51
Component: engine
2016-03-28 05:20:06 -07:00
ac00472922 systemctl show, no need to sudo
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Upstream-commit: ea1d8d6f82ee76f35b98b6ce2e3c543f24cf4b6c
Component: engine
2016-03-28 13:06:12 +02:00
dc5b8789eb Merge pull request #21461 from thaJeztah/add-ubuntu-16.04-xenial
docs: add Ubuntu 16.04 "xenial"
Upstream-commit: 9f6322e497a63d5837841d89bb7c6b3cbb866283
Component: engine
2016-03-25 16:07:05 -07:00
779c6aca92 docs for labels on build, networks and volumes
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 995e5beda74b99dfc920f6a79aee977ff5a15a72
Component: engine
2016-03-25 11:16:19 -07:00
8fcbd21a4a docs: add Ubuntu 16.04 "xenial"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 62e7fde80fde2efda14d2b60061106ea48715c50
Component: engine
2016-03-25 10:48:51 -07:00
cfeb820c82 Merge pull request #21361 from HackToday/addfilter
Add name/driver filter support for volume
Upstream-commit: 2de29fb9c2eaee803d69625a7105953da941356e
Component: engine
2016-03-25 08:07:38 +01:00
553d05c397 Add name/driver filter support for volume
This change include filter `name` and `driver`,
and also update related docs to reflect that filters usage.

Closes: #21243

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 8e9305ef946843ce2f8ef47909d6a866eab5dfa8
Component: engine
2016-03-25 01:11:17 +00:00
37e1c9e1c1 add docs for docker load --quiet
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 610ec8c7396ea4cc20465b99cf326684c82d23ff
Component: engine
2016-03-24 18:57:44 +01:00
91408a7472 Bump API Version to v1.24
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 928ea1e957812c351b77bb33be7f3ef9fd629231
Component: engine
2016-03-23 12:26:23 -04:00
9e6a0a5df2 Merge pull request #21340 from SvenDowideit/workdir-does-a-mkdir-p
WORKDIR is like calling mkdir - but we've not told people
Upstream-commit: f26193e2cfa04e4fa37cebe62de07eb46e0efed7
Component: engine
2016-03-22 18:41:15 -07:00
7c90f8b43b Merge pull request #21370 from tonistiigi/expose-layer-ids
Expose RootFS in image inspect
Upstream-commit: 694b32df51ac82afdf4695569e87dad7eaf71de4
Component: engine
2016-03-22 20:33:18 -04:00
48cef14de6 Merge pull request #21367 from mlaventure/containerd-docs-cleanup
Remove unneeded references to execDriver
Upstream-commit: 3ce494f48cc37b1e4065b62e58ec1c0a5df0e00c
Component: engine
2016-03-22 19:40:27 -04:00
296caafbd2 Expose RootFS in image inspect
Fixes #20451

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 14dc4a7158a141b5c13aa63231e467f0c3235850
Component: engine
2016-03-22 13:49:30 -07:00
f18bd98fd4 Merge pull request #21383 from estesp/shared-userns-net-ipc
Allow net and IPC namespaces to be shared when userns=on
Upstream-commit: 62d45566544344b6f562bff7792976702ed8938b
Component: engine
2016-03-22 11:40:12 -07:00
85da9b3aae Merge pull request #21223 from cpuguy83/add_nocp_to_vols
Add explicit flags for volume cp/no-cp
Upstream-commit: de9ff4bdc0e17a0fd455790972d83133f424ef9d
Component: engine
2016-03-22 13:45:12 -04:00
8ddf12229f Merge pull request #21366 from martinmosegaard/master
Fix plural typo in 'save' command help
Upstream-commit: e8774fbb9f76a2ed7d02039a1a6c490fdbe0160c
Component: engine
2016-03-22 17:26:32 +01:00
27791e6516 Update 'save' command help
Based on review feedback.

Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
Upstream-commit: 5a701c3e4cd63f0b17b4fe9ab13c8cbe0ea5d353
Component: engine
2016-03-22 08:16:52 +01:00
bec4433ff4 WORKDIR is like calling mkdir - but we've not told people
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: c937b43abd302b7643e0257a843ffda60f101fcc
Component: engine
2016-03-22 14:05:56 +10:00