342ff0d65d
Overlay Network needs Unique Hostname
...
Resolves : #19301
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 3024604054a588f213b671c7f1ec5eed2c99b78a
Component: engine
2016-02-08 15:14:38 -06:00
1297aa4525
Tweak VM volume mapping paragraph
...
The wording looked like there was maybe a copy-paste error there, I tried to make it a bit more clear.
Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io >
Upstream-commit: a3c290536a844fd57326a2c2776adbfdc84cc984
Component: engine
2016-02-06 13:35:02 +02:00
bace12bd53
Add support details for storage driver
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: feab8b179e20833dd0a65e58934cf24938da6d84
Component: engine
2016-02-04 00:51:02 +00:00
856f16871a
Fix typo
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 2fd35de274fa25d5031756eb5fdf3f3240bc4d9d
Component: engine
2016-02-02 19:07:58 -08:00
51e3bc5e37
Update networkingcontainers.md
...
updated line on how to exit the container after the ping test - in my environment (Ubuntu 14.04.1, bash) ctrl-c does not work to exit the shell, and `exit` must be used instead.
Signed-off-by: Troy Denton <Troy.Denton@younessleeptechnologies.com >
Upstream-commit: 0e147547660c830e5ea33a0b9a0281e64256efab
Component: engine
2016-02-02 19:05:55 -08:00
53c800043a
Merge pull request #19865 from mavenugo/ndocs
...
Docs cleanup for networking features added in 1.10
Upstream-commit: ef52a53c34d9f128d9435d031442509837c25c02
Component: engine
2016-02-02 17:36:46 +01:00
01f2954590
Docs cleanup for networking features added in v1.10
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6f863cfa18f30d1df2f1f81b2b4f456dee2a73b8
Component: engine
2016-02-02 06:10:41 -08:00
642e9a30eb
Correct old virtual size
...
In new content addressable model, image no longer
have virtual size column, it is now 'size'. So we
need to update related docs about them.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 1ab7d76f30f3cf693c986eb827ad49a6554d806d
Component: engine
2016-02-02 12:28:33 +00:00
486d68813e
Updating for CAS changes and new select a driver section
...
Adding changes requested by @jamtur01 and wrapping to 80 chars
Adding typo fixes and replacing tabs with 4xspaces
Closes and fixes #19240
Updating with content addressable storage model changes
Signed-off-by: Nigel <nigelpoulton@hotmail.com >
Upstream-commit: 89923c1f32aeff5bf11fbb04723dd0e154559545
Component: engine
2016-01-30 18:03:04 -08:00
9cc23f26d7
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: ebd1f70165faf1c19325f930b866365cab8e765b
Component: engine
2016-01-28 11:49:07 +08:00
e734434f58
Creating Engine specific menu
...
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e310d070f498a2ac494c6d3fde0ec5d6e4479e14
Component: engine
2016-01-26 15:58:53 -08:00
ae9bd7f8a5
Add missing words in selectadriver.md
...
Signed-off-by: Victor Costan <costan@gmail.com >
Upstream-commit: e5e90347d28c11b6000cb5471454d24f3aa8b421
Component: engine
2016-01-26 01:06:59 -05:00
45cae822ec
Update aufs-driver.md
...
fix typo in file path for image layers
Signed-off-by: bjcheny <companycy@gmail.com >
Upstream-commit: ac1eac21c91c1b8395a0356699f58f1d91d0d173
Component: engine
2016-01-24 10:03:29 +08:00
d3c651df14
Fix minor doc grammar issues
...
Signed-off-by: Dave Barboza <dxbarboza@gmail.com >
Upstream-commit: f50d0d7fdb11ce36715adfbf857e4668c0fd8f75
Component: engine
2016-01-20 10:52:21 -05:00
819b85bb3a
Add Subnets info for user-defined network
...
* If user doesn't specify the subnets to create a network, it will pick
subnets from inside preferred pool. This PR aims to inspect these subnets info
* Add integration tests for docker inspect the subnets.
* docker-py project is already synchronized.
* jenkins checks depend on https://github.com/docker/docker-py/pull/888
Fixes issue #18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 5cc672b0061f3df41073cb7b4ff962998a13a09c
Component: engine
2016-01-15 10:03:29 +08:00
082c746378
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
Upstream-commit: 73a5393bf3530815a608725fe2546121ccadbfe4
Component: engine
2016-01-14 10:58:51 -08:00
8eb1087397
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dda513ef651b42fcb9625e651f664554161c0a6a
Component: engine
2016-01-14 08:44:41 -08:00
806650627f
Add network ID to container inspect
...
Fixes issue #19089
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 9f676ade0aef66bb66a26171d6bfb27f105fa1df
Component: engine
2016-01-14 22:33:41 +08:00
bb8be65a6c
Merge pull request #19157 from wenchma/update_build_bridges
...
Update the doc of build-bridges.md
Upstream-commit: 0ed2e26f51f6b82c1b476562c3ae4134c38b26e9
Component: engine
2016-01-14 11:10:37 +01:00
ed3f8ef029
Merge pull request #19252 from HackToday/fix-vol-resp-doc
...
Update response content for volume mounts
Upstream-commit: 63525a6dc5f7be370736ec2905d40a8c8fdf1162
Component: engine
2016-01-14 09:15:13 +01:00
3baefd3b5b
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: e47112d3e812b90b240624711e7a5d2d203d6746
Component: engine
2016-01-13 13:57:31 -05:00
69c1610f93
Merge pull request #19249 from calavera/carry_17414
...
[Carry 17414] Added additional container information to "docker info".
Upstream-commit: a79f96828f7da2fc762002bf79ab8a9dcf908457
Component: engine
2016-01-13 10:42:22 +01:00
c28d7c537e
Update response content for volume mounts
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 6a04ecf81333d7b26928f0dcbfb416ca788f287c
Component: engine
2016-01-13 03:48:14 +00:00
6e46b2fdf4
Docs update for link functionality in user-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2aa5f33b20881d3d5e7f412ff946f83f33cde810
Component: engine
2016-01-12 13:38:48 -08:00
e2b2a71502
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
Upstream-commit: 301627c677b530a9ea77ecea6d1c82eec83cd9ac
Component: engine
2016-01-12 07:06:31 -08:00
92d4a617b2
Update the doc of build-bridges.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 0ba6a128eeee3f1519fa3842a6847402a7eafa05
Component: engine
2016-01-12 15:52:33 +08:00
3b26d1d1d4
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 79d4f0f56ec84922184e25c0263807158b6fb76b
Component: engine
2016-01-11 20:13:39 -05:00
aa00140122
Added additional container information to "docker info".
...
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.
Signed-off-by: Kim Eik <kim@heldig.org >
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
Upstream-commit: e732f4e649a3420eab3b6541dacbefe3cf00719a
Component: engine
2016-01-11 19:14:44 -05:00
d8dc8b7d33
Docker changes for libnetwork vendoring..
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 64a6dc355815261ac438b12a262e3cda7c9181df
Component: engine
2016-01-08 14:13:55 -08:00
7467c1af44
Allow user to choose the IP address for the container
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c
Component: engine
2016-01-08 10:09:16 -08:00
edc9578a83
Merge pull request #18378 from tonistiigi/content-addressability-storage-docs
...
Update storage docs for content-addressability
Upstream-commit: b12ef0fe00245ca549be5822d8b26033b59cff7a
Component: engine
2016-01-07 16:44:29 -08:00
33bcd44d7d
Remove the old reference link
...
Fixes : #19152
As issue #14214 closed, so this old link is not needed.
We can remove it now.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: ca7b69016a13739db74eb09046d8344762a2caa4
Component: engine
2016-01-07 10:23:36 +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
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
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
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
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
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
3dd9453e30
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
2015-12-26 11:42:55 +01: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
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
7363973c86
Merge pull request #18804 from mqliang/patch-6
...
Update selectadriver.md
Upstream-commit: 6d04d9cda8061456b921569266ca9f996c4b7eae
Component: engine
2015-12-21 09:56:05 +01:00
51d11f3a43
update document
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 41c2dab459ff9e4075e15889b7aea03cab58ce71
Component: engine
2015-12-21 11:53:38 +08:00
afa2c3e567
Merge pull request #18798 from mqliang/patch-1
...
Update dockervolumes.md
Upstream-commit: e9f72410ae5c91133a63fbe2d2bd9b36614bc460
Component: engine
2015-12-21 01:09:52 +01:00
6c1f488ddd
Merge pull request #18801 from mqliang/patch-3
...
Update index.md
Upstream-commit: 83f28cb374f6e08e2e929ea86833c0976ce47cf3
Component: engine
2015-12-21 01:08:58 +01:00
4fa7f47239
Update dockervolumes.md
...
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 3dd90e564c65e3a38160a6d24c036c0b0ee3c8b8
Component: engine
2015-12-20 23:41:00 +08:00
5597d2d934
Update btrfs-driver.md
...
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 8737896e421ed5a9c90a7b0e4395633ea93f8f92
Component: engine
2015-12-20 23:08:01 +08:00
35d7acd5b7
Update index.md
...
fix typo in document
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local >
Upstream-commit: 38ee016966ef5ad8f08d42c9a0dd9effd6930c73
Component: engine
2015-12-20 23:00:38 +08:00
0e3b79cb4d
Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables
...
update syntax for empty value labels
Upstream-commit: 18925f37ed5cfb9dd54ee10ee99bc5f990f156b0
Component: engine
2015-12-19 21:53:21 -08:00
