1dce35922d
Merge pull request #19056 from clintonskitson/docs-rexray_update
...
Updated docs for consolidated list of REX-Ray providers
Upstream-commit: 7a15586f4fb4d5482b35fc00d1506ea8b36d2b10
Component: engine
2016-01-05 23:53:27 +01:00
3906315c1f
Merge pull request #19077 from AvdN/patch-2
...
example cannot work, pip needs --requirement
Upstream-commit: d9a38126562906381ac6829c4b49d1054e615dc6
Component: engine
2016-01-05 23:50:52 +01:00
caf108c7a2
Merge pull request #19045 from wenchma/network_api_update
...
Update docker network api doc
Upstream-commit: 180ff8d5015d60f1d1d7c9838d476ca5e4fc6117
Component: engine
2016-01-05 10:55:56 -08:00
7f8bab011e
Merge pull request #19051 from thaJeztah/dont-touch-var-lib-volumes
...
docs: add note to volume-plugins
Upstream-commit: f67fed5f77f868dc2550cc7267fb454cae2108b3
Component: engine
2016-01-05 09:15:21 -08:00
ba6c4901c7
Merge pull request #19070 from softprops/shiplift_client
...
add shiplift docker client to remote api client list
Upstream-commit: 09ad1bbc5897e34c6e6d5612b0e1ba709ed28a7d
Component: engine
2016-01-05 14:36:30 +01:00
738f0e36b5
add shiplift docker client to remote api client list
...
Signed-off-by: Doug Tangren <d.tangren@gmail.com >
Upstream-commit: 09e0c9fc24db44217885c58fb6023bcfef211ae0
Component: engine
2016-01-05 08:27:26 -05:00
609d075f70
Merge pull request #19075 from HackToday/fixvoldoc
...
Fix the unnecessary parameter
Upstream-commit: 4a4131ac1b5ca28a06802d4e904bc99afa721d1f
Component: engine
2016-01-05 11:51:33 +01:00
d4f5e05d82
Fix the unnecessary parameter
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 52b944dbba74b7d2be5bcabfe6937a5578020101
Component: engine
2016-01-05 10:26:01 +00:00
722bb40262
Fix a typo error
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 289faeac111486f19537a06166f283e73fa44c4b
Component: engine
2016-01-05 17:42:13 +08:00
7ff06a0e84
example cannot work, pip needs --requirement
...
The example is not explicit, but the requirements.txt file is most likely a list of requirements (i.e. list of packages to be installed)
and not a python package itself. As such it needs the "--requirements" or "-r" option.
Signed-off-by: Anthon van der Neut <anthon@mnt.org >
Upstream-commit: 8c1d0e31b40438efd1017535babf8429164a401f
Component: engine
2016-01-05 09:23:53 +01:00
0c89fbf389
Add ability to set cgroup parent for all containers
...
Fix #18022
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2e3186ab065a7130a6e6267d86750848d5eb7d80
Component: engine
2016-01-04 15:16:25 -08:00
58e545b6bf
Merge pull request #18888 from calavera/event_types
...
Event all the things!
Upstream-commit: 723be0a3325799fd6b2a6b689af54f5a07edf992
Component: engine
2016-01-04 13:07:33 -08:00
c2e5fdc393
Add filter by event type and documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 851fe00c64ffafeb27b12f7b0ed8e41f7720b477
Component: engine
2016-01-04 14:58:04 -05:00
d9c08e13db
Updated docs for consolidated list of REX-Ray providers
...
This commit includes the correct project link and also
includes a consolidated list of drivers that are supported.
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com >
Upstream-commit: 6084346bec4d4a50939468590c08ea4ca85f5d60
Component: engine
2016-01-04 11:28:25 -08:00
fc0ab04968
docs: add note to volume-plugins
...
The /var/lib/docker directory is reserved for
docker, and should not be touched by plugins.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fb893cf6568f2b0cdf500bc3ecfb231fd374ffac
Component: engine
2016-01-04 18:28:14 +01:00
b1b6046ba2
Merge pull request #18499 from thaJeztah/fix-run-reference-example
...
Fix pid=host example in documentation
Upstream-commit: 0fae65e228d29c8f8dd25e29a61eaa0922e13d1d
Component: engine
2016-01-04 08:51:02 -08:00
7489ecd35e
Fix pid=host example in documentation
...
The existing example didn't illustrate how to
install strace in the container. In addition,
the rhel7 image used is no longer public (and maintained)
so not a good image to use in the example.
This updates the example to use htop (strace is
not working without disabling apparmor for the container)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9b6592ca858a23376b838e9808d7fa3f15ebc381
Component: engine
2016-01-04 16:25:54 +01:00
d68e62b901
docs: update configuring docker for systemd
...
Ubuntu 15.04 and above uses systemd. Add a note
in the docs to point users to the right instructions.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 59301e018ce7933c86c9874c209802acdb170d69
Component: engine
2016-01-04 15:26:55 +01:00
cf1cf1d767
Update docker network api doc
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: d92d1de3d529343317e47f604963e5ad8476b3e6
Component: engine
2016-01-04 18:05:02 +08:00
1162375d21
Merge pull request #15666 from vdemeester/3519-configurable-escape
...
Implement configurable escape key for attach/exec
Upstream-commit: db738dd77f699e93f976441d5fc11ab48a2d6c68
Component: engine
2016-01-04 00:49:07 +01:00
5582f5eb83
Implement configurable detach key
...
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration
- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
configure the default escape keys for docker client.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 15aa2a663b47b6126a66efefcadb64edfbffb9f5
Component: engine
2016-01-03 23:03:39 +01:00
c32d38aa18
Merge pull request #18387 from wenchma/18385-improve_help_msg
...
Improvement for docker subcommand's help messages
Upstream-commit: 9d6c2196b54a20cef3ede074d521ccb6bdabbe63
Component: engine
2016-01-03 12:19:53 +01:00
b09d7888d3
Merge pull request #18891 from HackToday/18872-fix-volume-cmd
...
Fix the restore data example
Upstream-commit: dcbd5e04b79cab9e53f9700a07939f21a3268e6b
Component: engine
2016-01-02 00:43:46 +01:00
8a76cb28e3
Merge pull request #18932 from wenchma/same_name_of_container_image
...
Update integration tests when container and image have same name
Upstream-commit: 1a5b97c76143b7d26006916b23daf8fde73c35ac
Component: engine
2016-01-01 21:40:51 +01:00
38393c4316
fix typo
...
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu >
Upstream-commit: b4d4a805eaaf56c071327a528d8837f18796e209
Component: engine
2016-01-01 20:39:04 +01:00
b350f7594e
Improvement for docker subcommand's help messages
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: d7dc439623ff18d2a8dd152dbb032a307100cb2e
Component: engine
2016-01-01 12:27:28 +08:00
479e415aa9
Fix the restore data example
...
Fixes : #18872
For backup, restore case, we usually restore in same directory, so
when we untar it, we not need go to /dbdata directory, wich could
result in /dbdata/dbdata, this fix make it untar directly. The directory
/dbdata would be same as old container /dbdata.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 83c705c00d9be3d5064a7a3fcc5de0645fce21b1
Component: engine
2015-12-31 00:56:01 +00:00
301494dba6
Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2
...
Fix docs for memory-swap
Upstream-commit: 2c3d1a9b126d45647cfe8aa89008a93f83203a0c
Component: engine
2015-12-30 21:01:48 +01:00
2821f3dd6b
Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses
...
fix incorrect ip addresses in networkingcontainers
Upstream-commit: 3b605b5926cff095452f2c2dca374bd132e23fac
Component: engine
2015-12-30 17:49:08 +01:00
c8d08c88b3
Fix docs for memory-swap
...
Fixes : #18894
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c68a483e442758733e800546545f1e016113d9cd
Component: engine
2015-12-30 09:23:35 +08:00
069aa886a5
Merge pull request #18627 from londoncalling/cloud-installs
...
[WIP] docs updates per issue 18282 cloud installs
Upstream-commit: de84dfba75a3055b8cad4eb8e6d9fd7bcecc30fc
Component: engine
2015-12-29 14:54:18 -08:00
9d5c330d8f
Fix typo in daemon storage-driver docs
...
Signed-off-by: Thomas Swift <tgs242@gmail.com >
Upstream-commit: c44a8d8d8c9eccb79b16c874f083cd9597c3f6ca
Component: engine
2015-12-29 17:06:02 -05:00
4b86854122
Update integration tests when container and image have same name
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 9fbb1306e83576086e924ff4fbf35b9a74beb28a
Component: engine
2015-12-29 11:08:31 +08:00
f07bb00458
Merge pull request #18780 from jfrazelle/seccomp-default
...
set default seccomp profile
Upstream-commit: 78ce43bad85fdf97d7c836315e46b531901c8ae7
Component: engine
2015-12-28 16:46:30 -08:00
3f6acddbd7
Fixed /etc/defaults/docker to /etc/default/docker
...
/etc/default/docker is the correct file location in my system, and also according Docker's own documentation at https://github.com/docker/docker/blob/master/docs/articles/configuring.md#configuring-docker
Signed-off-by: J Bruni <contato@jbruni.com.br >
Upstream-commit: 153948ac46851397c9c4fd8117647c608f4d216a
Component: engine
2015-12-28 20:57:36 -02:00
383605ec04
Merge pull request #18899 from cpswan/18898-fix-storage-driver-example
...
Fix --storage-driver example
Upstream-commit: 8c6ad0991e313805ea2c67275086f2c9130cceda
Component: engine
2015-12-28 21:58:43 +01:00
3f03a2c89c
add docs and unconfined to run a container without the default seccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 15674c5fb74df00d7560fb35619a5372ea2ee74e
Component: engine
2015-12-28 10:26:51 -08:00
3ae3fdb79c
Merge pull request #15078 from hqhq/hq_add_set_api_v2
...
Implement docker update command
Upstream-commit: 8669ea01ba93139a51783ac17658dedd47538b9c
Component: engine
2015-12-28 08:55:32 -08:00
c4af30652d
Implemet docker update command
...
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 8799c4fc0feadede6ae60e77bd7d9dfd7cc72a79
Component: engine
2015-12-28 19:19:26 +08:00
6a84e60720
Specify that Docker requires x64
...
Adds this requirement to docker/docker. Already replicated in docker/tutorials
Resolves : #18401
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 8134a562c603679a02bc7841f10676ddba6e4001
Component: engine
2015-12-26 19:02:20 -05:00
3dd9453e30
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
2015-12-26 11:42:55 +01:00
d743d1334b
Fix --storage-driver example (and --graph)
...
Signed-off-by: Chris Swan <chris.swan@iee.org >
Upstream-commit: 5eef38d364c2d850bd98c70824a67178a44d94c0
Component: engine
2015-12-24 17:02:58 +00:00
b5eef30f35
Fix --storage-driver example
...
Signed-off-by: Chris Swan <chris.swan@iee.org >
Upstream-commit: b6be4acfcc1d8801dc4250acd3701a7d3325334f
Component: engine
2015-12-24 16:43:37 +00:00
ac71b2f7e1
fixed links in Digital Ocean example
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 3ff20fafccdce09428171511982305a180dc9928
Component: engine
2015-12-23 16:31:49 -08:00
e2277fc388
Fix typo in btrfs userguide doc
...
Signed-off-by: Samuel Dion-Girardeau <samuel.diongirardeau@gmail.com >
Upstream-commit: 63f9f2c05bd4c62dbd366f1acb97f4a0b1b52f1d
Component: engine
2015-12-23 15:10:01 -05:00
743bbc7202
remove =false from options that default to false in the docs
...
This re-aligns the docs with what the cmd line now does.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: e6115a6c1c02768898b0a47e550e6c67b433c436
Component: engine
2015-12-23 07:11:35 -08:00
6f10e6b229
Add filter for network ls to hide predefined net
...
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 26dd026bd70c9c18a16b0e339821c309e56d8ff0
Component: engine
2015-12-23 13:26:40 +08:00
663db95ac5
libnetwork vendoring
...
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436
Brings in:
* Support for overlay network driver in 3.10+ kernels
* Freebsd compilation fixes
* Remove .dockerinit dependency
* IPAM driver capability support
* Network internal mode support
* Misc. fixes
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: f0904affd127ea8bdebfc3f3c586f8eb38e91da5
Component: engine
2015-12-22 13:32:17 -08:00
bcd4ff1dab
Merge pull request #18837 from thaJeztah/remove-darwin-i386
...
Don't build Darwin 32-bit binaries
Upstream-commit: ff796e5bf740dba44c88132406892bf4c7050a92
Component: engine
2015-12-22 09:51:29 -08:00
89fa05b282
Update link for Weave Net plugin docs
...
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com >
Upstream-commit: 45241d36d349e0802cf12a2437a732b8c8c18479
Component: engine
2015-12-22 16:45:54 +00:00
