Commit Graph

399 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
19b58f8f21 Allow net and IPC namespaces to be shared when userns=on
Now that the namespace sharing code via runc is vendored with the
containerd changes, we can disable the restrictions on container to
container net and IPC namespace sharing when the daemon has user
namespaces enabled.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 2b278f48460453691c63ad81b0c87b50d8b18979
Component: engine
2016-03-21 22:20:26 -04:00
308c81e7d4 Add explicit flags for volume cp/no-cp
This allows a user to specify explicitly to enable
automatic copying of data from the container path to the volume path.
This does not change the default behavior of automatically copying, but
does allow a user to disable it at runtime.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b0ac69b67ef79c6c937f84bee3df20a1924ad334
Component: engine
2016-03-21 20:38:44 -04:00
bf213f3332 Remove unneeded references to execDriver
This includes:
 - updating the docs
 - removing dangling variables

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 8af4f89cba09105f3d581926aca6e231326f7054
Component: engine
2016-03-21 13:06:08 -07:00
15d11ca807 Fix plural typo in 'save' command help
The form "Save an images" is not correct.
Either "Save an image" or "Save images" work, but since
the save commands accepts multiple images, I chose the
latter.

Fixed in all places where I could grep "Save an image(s)".

Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
Upstream-commit: a826c244ed49996252fbeff238ae44c4fd3f33f8
Component: engine
2016-03-21 15:15:40 +01:00
2250308978 Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ca64269165fb30765d7ea0b0b231674df8da157b
Component: engine
2016-03-17 16:13:51 +08:00
5953ce529c Update Docker pull examples
The old examples no longer worked due to changes in
the client and Docker Hub.

This updates the "docker pull" documentation and
adds more examples and explanation of the features.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 32eff909b4d3072524041fffc9d43efe87d2116f
Component: engine
2016-03-16 00:35:58 +01:00
fd384bf5db Merge pull request #21209 from HackToday/fixdocps
Add the missed volume filter
Upstream-commit: f9fe796eabd015cbf861df2550a8bffd861a5b25
Component: engine
2016-03-15 10:59:52 +01:00
bff930c257 Add the missed volume filter
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: b1619766c0131a02774c7ec2b158c2fdf7206d05
Component: engine
2016-03-15 09:26:41 +00:00
30dcca7468 Merge pull request #20786 from rhvgoyal/min-free-space
devmapper: Add a new option dm.min_free_space_percent
Upstream-commit: bfed97b6881393be51e81b97040f3874b61b8d72
Component: engine
2016-03-14 20:10:43 -04:00
e578be78a3 Run privileged containers when userns are specified
Following #19995 and #17409 this PR enables skipping userns re-mapping
when creating a container (or when executing a command). Thus, enabling
privileged containers running side by side with userns remapped
containers.

The feature is enabled by specifying ```--userns:host```, which will not
remapped the user if userns are applied. If this flag is not specified,
the existing behavior (which blocks specific privileged operation)
remains.

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 6993e891d10c760d22e0ea3d455f13858cd0de46
Component: engine
2016-03-14 17:09:25 +02:00
83045d547d Merge pull request #20970 from dmcgowan/login-oauth
OAuth support for registries
Upstream-commit: b9361f02da25108af75238093959634e433d72a0
Component: engine
2016-03-14 15:49:44 +01:00
f960c0a25f Include all endpoints in network inspect object
Prior to this change, the "docker network inspect" contains only the
endpoints that have active local container. This excludes all the remote
and stale endpoints. By including all the endpoints, it makes debugging
much simpler and also allows the user to cleanup any stale endpoints
using "docker network disconnect -f {network} {endpoint-name}".

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2ef00ba89fc04b0a7571aa050d8a11c06f758d9b
Component: engine
2016-03-13 16:58:53 -07:00
96dba4b028 docs: add $ before HOME
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 219e5fdda36a18104f7593da9ed8ca097a60aab3
Component: engine
2016-03-12 14:11:01 +01:00
76b88b0399 Merge pull request #21045 from calavera/registry_config_options
Move registry service options to the daemon configuration.
Upstream-commit: 1d094255d57090d34b2c11c12b253c277ae1ce28
Component: engine
2016-03-11 00:48:55 +01:00
91021f9750 Move registry service options to the daemon configuration.
Allowing to set their values in the daemon configuration file.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 59586d02b1cc004f14cd7ff6b454211f562da326
Component: engine
2016-03-10 11:53:11 -05:00
1f8ebb7040 Merge pull request #21043 from runcom/plugin-sdk
docs: extend: plugins: mention the sdk + systemd socket activation
Upstream-commit: e7093a95cf324c7928e340c5a388062a1ed05625
Component: engine
2016-03-10 15:12:23 +01:00
b065a55c44 docs: extend: plugins: mention the sdk + systemd socket activation
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 97e07ca10ac315b3d6bbaf72fbe1fd4f7b9a3a2d
Component: engine
2016-03-10 12:17:06 +01:00
62cafaa190 Add support for identity tokens in client credentials store
Update unit test and documentation to handle the new case where Username
is set to <token> to indicate an identity token is involved.

Change the "Password" field in communications with the credential helper
to "Secret" to make clear it has a more generic purpose.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: ba0aa5311aa27fe77166f03d8bcc0174e2985913
Component: engine
2016-03-09 13:47:57 -08:00
356157b64b Merge pull request #18697 from jfrazelle/pids-cgroup
Add PIDs cgroup support to Docker
Upstream-commit: dd32445ecc6b706e8681dcc9d80c42c9b6cbf6cd
Component: engine
2016-03-08 14:03:36 -08:00
de84e87a00 pids limit support
update bash commpletion for pids limit

update check config for kernel

add docs for pids limit

add pids stats

add stats to docker client

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 69cf03700fed7bf5eb7fe00c9214737e21478e49
Component: engine
2016-03-08 07:55:01 -08:00
189d1f74b1 cliconfig: credentials: set default for unix
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: fe8fa85074a62241640e5c2d9d2501c354517efc
Component: engine
2016-03-08 09:21:36 +01:00
e7b4b05653 devmapper: Add a new option dm.min_free_space
Once thin pool gets full, bad things can happen. Especially in case of xfs
it is possible that xfs keeps on retrying IO infinitely (for certain kind
of IO) and container hangs. 

One way to mitigate the problem is that once thin pool is about to get full,
start failing some of the docker operations like pulling new images or
creation of new containers. That way user will get warning ahead of time
and can try to rectify it by creating more free space in thin pool. This
can be done either by deleting existing images/containers or by adding more
free space to thin pool.

This patch adds a new option dm.min_free_space to devicemapper graph
driver. Say one specifies dm.min_free_space=10%. This means atleast
10% of data and metadata blocks should be free in pool before new device
creation is allowed, otherwise operation will fail.

By default min_free_space is 10%. User can change it by specifying
dm.min_free_space=X% on command line. A value of 0% will disable the
check.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 2e222f69b3486cf20039525a882ae4153b52f92c
Component: engine
2016-03-07 20:27:39 +00:00
6f468d5dd9 Adds clarification to behavior of missing directories.
Closes #20920

Signed-off-by: Micah Zoltu <micah@zoltu.net>
Upstream-commit: 889d06178adef05d9f9d34a2098f0e6023b84bed
Component: engine
2016-03-03 23:41:13 +00:00
c06747671b Merge pull request #20262 from cpuguy83/implemnt_mount_opts_for_local_driver
Support mount opts for `local` volume driver
Upstream-commit: c4be28d6a81ce480a24fdba04dc78a3a5c8a1f08
Component: engine
2016-03-03 09:02:12 -08:00
8bbce28a1d Support mount opts for local volume driver
Allows users to submit options similar to the `mount` command when
creating a volume with the `local` volume driver.

For example:

```go
$ docker volume create -d local --opt type=nfs --opt device=myNfsServer:/data --opt o=noatime,nosuid
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b05b2370757d7143d761e5e6abb8c0f9b009f737
Component: engine
2016-03-03 10:32:25 -05:00
576af48c09 Merge pull request #20388 from hqhq/hq_add_cgroup_driver_info
Add CgroupDriver to docker info
Upstream-commit: 508a17baba3c39496008fc5b5e3fe890b8a1b31b
Component: engine
2016-03-02 23:17:27 +01:00
e53352c54a docs: improve note for Fedora 22
Move the note more up, to prevent people from starting
the daemon with --userns-remap before touching the files.

Also clarify that these steps must be done *before* enabling
userns-remap and starting the daemon.

Also fixed some minor Markup formatting issues.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 069da069cb5386e6a441f34d5813a94fc738de59
Component: engine
2016-03-02 14:46:18 +01:00
17d0f2d01e Add CgroupDriver to docker info
Fixes: #19539

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: ca89c329b9f0748da74d08d02a47bc494e7965e2
Component: engine
2016-03-02 20:07:06 +08:00
afc4d63ffe Merge pull request #20565 from kencochrane/remove_email_on_login
Remove email address field from login
Upstream-commit: 2453262e7ba131fede74dbf31df41da9d2f36c34
Component: engine
2016-03-01 08:02:16 -08:00