centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
18,820 Commits 57 Branches 28 Tags
19ff8e09ba76cd0cabef8e5e87e4c999d7baf2d3
Commit Graph

18820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester
19ff8e09ba Merge pull request #16870 from cxxly/16756-refactor-docker_cli_proxy_test 
refactor docker_cli_proxy_test.go
 2015-10-09 15:43:39 +02:00
Sebastiaan van Stijn
3526993b2f Merge pull request #16108 from charleswhchan/patch-2 
Touch up Node.js and MongoDB examples
 2015-10-09 15:33:30 +02:00
moxiegirl
06146b333c Merge pull request #16876 from luca3m/patch-1 
Sync with remote API
 2015-10-09 06:30:02 -07:00
moxiegirl
734c9d2f67 Merge pull request #16833 from sunyuan3/cpu-shares 
Add description for "--cpu-shares=0".
 2015-10-09 06:29:18 -07:00
moxiegirl
b7083cf08b Merge pull request #15903 from charleswhchan/patch-1 
Revise documentation for Docker LABEL.
 2015-10-09 06:11:50 -07:00
Luca Marturana
d7ca0a48ac Sync with remote API 
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also container events

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also man page

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
 2015-10-09 13:53:51 +02:00
Vincent Demeester
04e883c22b Merge pull request #16879 from x1022as/network 
remove useless function generateIfaceName()
 2015-10-09 13:25:03 +02:00
Deng Guangxing
a1620084c5 remove useless function generateIfaceName() 
generateIfaceName() is useless as libnetwork has done
the job.

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-10-09 18:07:54 +08:00
Xiaoxu Chen
1db161768c update docker_cli_proxy_test.go 
Part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-09 14:53:56 +08:00
Charles Chan
c7e0531c3a Revise documentation for Docker LABEL, including review comments by @SvenDowideit and @thaJeztah in PR #15903. 
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-10-08 20:47:09 -07:00
Xiaoxu Chen
14f43406a3 refactor docker_cli_proxy_test.go 
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
 2015-10-09 11:11:05 +08:00
Arnaud Porterie
e7ef8633d5 Merge pull request #16862 from cpuguy83/bump_runc 
Bump runc
 2015-10-08 19:09:47 -07:00
Jess Frazelle
a1d432301d Merge pull request #16859 from diogomonica/changing-trust-server-checks 
Changing trustServer allowed URL validation
 2015-10-08 18:33:35 -07:00
Jess Frazelle
103189e562 Merge pull request #16866 from cpuguy83/fix_exp_graphdriver_error 
Fix exp tests cast protodriver to naivediffdriver
 2015-10-08 18:01:48 -07:00
Diogo Monica
a2f9fb7777 Changing trustServer allowed URL behavior 
Signed-off-by: Diogo Monica <diogo@docker.com>
 2015-10-08 17:47:25 -07:00
Brian Goff
a705ca0173 Fix exp tests cast protodriver to naivediffdriver 
A recent change made `graphdriver.NaiveDiffDriver` from a function to a
struct. New function is `graphdriver.NewNaiveDiffDriver.

The graphdriver plugin PR was created (and tests run) before this change
was introduced causing the failure to not be seen until after merge.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-08 19:44:50 -04:00
Michael Crosby
6d9a84bcd0 Merge pull request #16152 from chlunde/devmapper-mount-flags 
Use pkg/mount to support more flags in dm.mountopt
 2015-10-08 16:02:50 -07:00
Sebastiaan van Stijn
bccf5c756b Merge pull request #16861 from moxiegirl/fix-testing-stuff 
Removing the tests.
 2015-10-09 00:46:02 +02:00
Mary Anthony
5a94d2b5b9 Removing the tests. We have training site now. 
Ugh...actually adding the files to delete

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-08 15:22:59 -07:00
Jess Frazelle
b50a88cfd7 Merge pull request #16644 from dhiltgen/discovery_tls 
Add TLS support for discovery backend
 2015-10-08 14:21:06 -07:00
Jess Frazelle
67e38cc54c Merge pull request #16638 from MHBauer/daemon-derepo 
refactor daemon image tagging
 2015-10-08 14:14:20 -07:00
Brian Goff
4ab8514387 Merge pull request #16643 from chenchun/fix_empty_repository 
Do not try to cleanupMounts if daemon.repository is empty
 2015-10-08 17:10:49 -04:00
Brian Goff
d9f5f1954c Bump runc 
Fixes a race when starting a container when there is an error, the stdio
streams are not always written.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-08 17:07:00 -04:00
Jess Frazelle
01cd67e752 Merge pull request #16366 from MHBauer/logs-refactor 
refactor logs to not use internal data structures
 2015-10-08 14:05:02 -07:00
Jess Frazelle
bea2257f92 Merge pull request #16803 from tiborvass/pkg-broadcaster 
Move types from progressreader and broadcastwriter to broadcaster
 2015-10-08 13:51:08 -07:00
Jess Frazelle
4c55464dd3 Merge pull request #13777 from cpuguy83/graphdriver_extpoints 
Create extpoint for graphdrivers
 2015-10-08 13:46:42 -07:00
Brian Goff
5ec323aaa2 Merge pull request #16660 from Microsoft/js/hostname 
Windows: --hostname support
 2015-10-08 16:11:49 -04:00
Vincent Demeester
caf7d83c67 Merge pull request #16826 from LK4D4/refactor_listenfd 
Refactor listenFD function
 2015-10-08 22:08:52 +02:00
Vincent Demeester
991589d518 Merge pull request #16781 from brahmaroutu/pkg_integration_timeout 
timeouts causing tests to fail differently. GCCGO CI.
 2015-10-08 22:02:22 +02:00
Jess Frazelle
4796b5c2f8 Merge pull request #16544 from Mashimiao/fix-bug-client-start-signal-discarded 
client/start: fix logic for discarded signal
 2015-10-08 12:54:31 -07:00
Jess Frazelle
5bde858db5 Merge pull request #16581 from fgimenez/11584-stdcopy-test-coverage 
Added test coverage to StdCopy closes #11584
 2015-10-08 12:53:25 -07:00
moxiegirl
246072e8c5 Merge pull request #16837 from x1022as/network 
update dockernetwork.md and network api
 2015-10-08 12:27:49 -07:00
Jess Frazelle
cc411c054f Merge pull request #16785 from cpuguy83/exec_cleanup 
Cleanup some issues with exec
 2015-10-08 12:02:03 -07:00
Jess Frazelle
b5d914188e Merge pull request #16674 from coolljt0725/use_consistent_command_description 
Use consistent command description
 2015-10-08 12:01:16 -07:00
Sebastiaan van Stijn
80469f8180 Merge pull request #16850 from moxiegirl/fix-command-meta 
Fixing issues introduced with new commands adding index
 2015-10-08 20:59:59 +02:00
Jess Frazelle
73e3d85c28 Merge pull request #16791 from flaccid/patch-1 
Do not run yaourt as root/sudo
 2015-10-08 11:50:56 -07:00
Jess Frazelle
9123f77a78 Merge pull request #16817 from cpuguy83/explicit_volume_ls 
Make `docker volume` behave like `docker network`
 2015-10-08 11:36:51 -07:00
Arnaud Porterie
b3b9fe8c77 Merge pull request #15868 from crosbymichael/aufs-data 
Add aufs data structure for added mount information
 2015-10-08 11:17:20 -07:00
Jess Frazelle
41c99cc621 Merge pull request #15693 from vdemeester/15659-image-label-filter 
Fix #15659 : filter by label for docker images commited
 2015-10-08 11:14:51 -07:00
Vincent Demeester
683ee20562 Merge pull request #16669 from sunyuan3/TestRunInValidCPUShares 
add TestRunInValidCPUShares
 2015-10-08 19:38:21 +02:00
Jess Frazelle
2b6af905fa Merge pull request #16815 from duglin/fixHelp 
Fix help test comment to align with the code
 2015-10-08 09:29:32 -07:00
Mary Anthony
b44ef2b306 Fixing issues in command ordering. Adding index.md 
Adjust bullets
Entering Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-08 09:28:46 -07:00
Jess Frazelle
c281f692c7 Merge pull request #16825 from LK4D4/return_listenbuffer 
Return listenbuffer behavior
 2015-10-08 09:18:47 -07:00
Alexander Morozov
6654b0e05f Merge pull request #16852 from estesp/overlay-cleanup 
Simplify dir removal in overlay driver
 2015-10-08 08:44:50 -07:00
Alexander Morozov
9e58793207 Merge pull request #16842 from coolljt0725/revert_16818 
Revert add parent img refcount for faster rmi
 2015-10-08 08:40:35 -07:00
Vincent Batts
c3e5364813 Merge pull request #16823 from rhvgoyal/check-thin-pool 
devmapper: Make sure device is a thin pool device
 2015-10-08 11:27:53 -04:00
Srini Brahmaroutu
ffe32ac371 Timeouts are causing tests to fail differently. GCCGO CI. 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-10-08 15:14:56 +00:00
Phil Estes
f418f4864b Merge pull request #16848 from thaJeztah/fix-broken-link-in-error 
Fix broken link in error-message
 2015-10-08 11:11:11 -04:00
Phil Estes
6ed11b5374 Simplify dir removal in overlay driver 
There is no need to call `os.Stat` on the driver filesystem path of a
container as `os.RemoveAll` already handles (properly) the case where
the path no longer exists.

Given the results of the stat() were not even being used,  there is no
value in erroring out because of the stat call failure, and worse, it
prevents daemon cleanup of containers in "Dead" state unless you re-create
directories that were already removed via a manual cleanup after a
failure.  This brings removal in overlay in line with aufs/devicemapper
drivers which don't error out if the filesystem path no longer exists.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-10-08 11:04:00 -04:00
James Turnbull
52de250496 Merge pull request #16832 from sunyuan3/daemoncommand 
Replace the deprecated -d with docker daemon.
 2015-10-08 10:06:10 -04:00