0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22339 commits 14 branches 412 tags 338 MiB
Commit graph

175 commits

Author SHA1 Message Date
David Calavera
2e6c841b82 Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge 
Expose bridge IPv6 setting to `docker network inspect`
 2016-02-18 10:35:04 -08:00
Sebastiaan van Stijn
a9c73b1a7e Merge pull request #20425 from HackToday/fixindex 
Fix wrong index marking
 2016-02-18 14:49:15 +01:00
Kai Qiang Wu(Kennan)
0b4e0ce7cd Fix wrong index marking 
The index was wrong set in docs, so let's fix it

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-02-18 03:08:21 +00:00
Kai Qiang Wu(Kennan)
f7fe2f0992 Add sudo for related command 
The du need sudo to perform to get correct results.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-02-18 02:58:26 +00:00
Sebastiaan van Stijn
7da5784b10 Fix documentation typos 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-02-15 15:46:56 +01:00
David Calavera
b734d0e8cc Merge pull request #20285 from moxiegirl/fix-user-guide 
Update the userguide to fix user feedback
 2016-02-12 11:07:03 -08:00
Mary Anthony
bf76b1d686 Update the userguide to fix user feedback 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-12 10:08:59 -08:00
David Calavera
3a3c953806 Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options 
Fix an erratum; s/two/three/
 2016-02-12 09:58:48 -08:00
Yi EungJun
8c93958fcb Fix an erratum; s/two/three/ 
There are three options because the new one was added at 6f863cf.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
 2016-02-13 00:14:35 +09:00
Roland Huß
03b25e024e Fix some formatting 
* Codified example container names
* Emphasised 'link' vs 'legacy link' (instead of using code markup)
* Add a missing ``` for a code example

Signed-off-by: Roland Huß <roland@jolokia.org>
 2016-02-12 10:34:55 +01:00
Aidan Hobson Sayers
d736a9d2c3 Add docs for --ipv6 option, also add --internal as appropriate 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-02-12 01:42:15 +00:00
Victor Vieux
99a396902f fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-11 15:49:36 -08:00
Aditi Rajagopal
3024604054 Overlay Network needs Unique Hostname 
Resolves: #19301
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
 2016-02-08 15:14:38 -06:00
Ilkka Laukkanen
a3c290536a 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>
 2016-02-06 13:35:02 +02:00
Kai Qiang Wu(Kennan)
feab8b179e Add support details for storage driver 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-02-04 00:51:02 +00:00
Arnaud Porterie
2fd35de274 Fix typo 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-02-02 19:07:58 -08:00
Troy Denton
0e14754766 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>
 2016-02-02 19:05:55 -08:00
Vincent Demeester
ef52a53c34 Merge pull request #19865 from mavenugo/ndocs 
Docs cleanup for networking features added in 1.10
 2016-02-02 17:36:46 +01:00
Madhu Venugopal
6f863cfa18 Docs cleanup for networking features added in v1.10 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-02 06:10:41 -08:00
Kai Qiang Wu(Kennan)
1ab7d76f30 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>
 2016-02-02 12:28:33 +00:00
Nigel
89923c1f32 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>
 2016-01-30 18:03:04 -08:00
Wen Cheng Ma
ebd1f70165 docs: document options for default network driver 
Fixes issue #18410

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-28 11:49:07 +08:00
Mary Anthony
e310d070f4 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>
 2016-01-26 15:58:53 -08:00
Victor Costan
e5e90347d2 Add missing words in selectadriver.md 
Signed-off-by: Victor Costan <costan@gmail.com>
 2016-01-26 01:06:59 -05:00
companycy
ac1eac21c9 Update aufs-driver.md 
fix typo in file path for image layers

Signed-off-by: bjcheny <companycy@gmail.com>
 2016-01-24 10:03:29 +08:00
Dave Barboza
f50d0d7fdb Fix minor doc grammar issues 
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
 2016-01-20 10:52:21 -05:00
Wen Cheng Ma
5cc672b006 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>
 2016-01-15 10:03:29 +08:00
David Calavera
73a5393bf3 Merge pull request #19242 from mavenugo/nsalias 
Network scoped alias support
 2016-01-14 10:58:51 -08:00
Madhu Venugopal
dda513ef65 Network scoped alias support 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 08:44:41 -08:00
Wen Cheng Ma
9f676ade0a Add network ID to container inspect 
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-14 22:33:41 +08:00
Vincent Demeester
0ed2e26f51 Merge pull request #19157 from wenchma/update_build_bridges 
Update the doc of build-bridges.md
 2016-01-14 11:10:37 +01:00
Vincent Demeester
63525a6dc5 Merge pull request #19252 from HackToday/fix-vol-resp-doc 
Update response content for volume mounts
 2016-01-14 09:15:13 +01:00
Shishir Mahajan
e47112d3e8 daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-01-13 13:57:31 -05:00
Antonio Murdaca
a79f96828f Merge pull request #19249 from calavera/carry_17414 
[Carry 17414] Added additional container information to "docker info".
 2016-01-13 10:42:22 +01:00
Kai Qiang Wu(Kennan)
6a04ecf813 Update response content for volume mounts 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-13 03:48:14 +00:00
Madhu Venugopal
2aa5f33b20 Docs update for link functionality in user-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-12 13:38:48 -08:00
Sebastiaan van Stijn
301627c677 Merge pull request #18906 from coolljt0725/connect_to_created 
Support network connect/disconnect to stopped container
 2016-01-12 07:06:31 -08:00
Wen Cheng Ma
0ba6a128ee Update the doc of build-bridges.md 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-12 15:52:33 +08:00
Lei Jitang
79d4f0f56e Add docker network connect/disconnect to non-running container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-11 20:13:39 -05:00
Kim Eik
e732f4e649 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 a9804ab1cb)
 2016-01-11 19:14:44 -05:00
Santhosh Manohar
64a6dc3558 Docker changes for libnetwork vendoring.. 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-08 14:13:55 -08:00
Alessandro Boch
2bb3fc1bc5 Allow user to choose the IP address for the container 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-08 10:09:16 -08:00
moxiegirl
b12ef0fe00 Merge pull request #18378 from tonistiigi/content-addressability-storage-docs 
Update storage docs for content-addressability
 2016-01-07 16:44:29 -08:00
Kai Qiang Wu(Kennan)
ca7b69016a 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>
 2016-01-07 10:23:36 +00:00
Wen Cheng Ma
289faeac11 Fix a typo error 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-05 17:42:13 +08:00
Sebastiaan van Stijn
dcbd5e04b7 Merge pull request #18891 from HackToday/18872-fix-volume-cmd 
Fix the restore data example
 2016-01-02 00:43:46 +01:00
Anthon van der Neut
b4d4a805ea fix typo 
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-01-01 20:39:04 +01:00
Kai Qiang Wu(Kennan)
83c705c00d 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>
 2015-12-31 00:56:01 +00:00
Sebastiaan van Stijn
3b605b5926 Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses 
fix incorrect ip addresses in networkingcontainers
 2015-12-30 17:49:08 +01:00
J Bruni
153948ac46 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>
 2015-12-28 20:57:36 -02:00