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

26908 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Howard
7ea707d5ef Windows: Enable TestImage and TestImport tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-08-30 15:20:55 -07:00
Vincent Demeester
73614f9f1e Merge pull request #26020 from tonistiigi/fix-eventsbefore-test 
Fix flaky TestEventsContainerFilterBeforeCreate
 2016-08-30 22:24:52 +02:00
Vincent Demeester
cf3e834c9b Merge pull request #26153 from Microsoft/jjh/testcommitcli 
Windows: Enable some commit tests
 2016-08-30 22:17:20 +02:00
Vincent Demeester
19aee54926 Merge pull request #26145 from allencloud/update-command-description 
update command description
 2016-08-30 22:16:57 +02:00
Vincent Demeester
8a46c18dd4 Merge pull request #26147 from Microsoft/jjh/testbuildapi 
Windows: Enable 5 Build API tests
 2016-08-30 22:12:36 +02:00
Vincent Demeester
16148d0420 Merge pull request #26149 from Microsoft/jjh/testbuildcli 
Windows: Enable multiple cli build tests
 2016-08-30 22:12:24 +02:00
John Howard
783fe398dc Merge pull request #26151 from Microsoft/jjh/testbuildhistory 
Windows: Enable docker_cli_history_test.go tests
 2016-08-30 11:58:31 -07:00
John Howard
bb4b31585c Windows: Enable multiple cli build tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-08-30 09:51:13 -07:00
John Howard
ac59dfa761 Windows: Enable some commit tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-08-30 09:48:18 -07:00
John Howard
a06c695177 Windows: Enable docker_cli_history_test 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-08-30 09:31:33 -07:00
John Howard
8bc1c9c08a Windows: Enable 5 Build API tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-08-30 08:41:17 -07:00
Vincent Demeester
5c2064f890 Merge pull request #26123 from cpuguy83/revert_makefile_build_args 
Fix passing custom APT_MIRROR on building Docker
 2016-08-30 17:30:48 +02:00
Anusha Ragunathan
5bd14f88cd Merge pull request #26134 from lixiaobing10051267/masterDockerExec 
Modify use of docker exec command in exec.go
 2016-08-30 08:27:02 -07:00
allencloud
123ce0e4be update command description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-30 23:07:42 +08:00
Daniel Nephin
bb1d70da9a Merge pull request #25214 from allencloud/make-node-ps-default-to-self 
make node ps default to self in swarm node
 2016-08-30 10:37:20 -04:00
Brian Goff
afd54a1a86 Merge pull request #26127 from lixiaobing10051267/masterDockerDeploy 
usage description of docker deploy in md not consistant with go file
 2016-08-30 10:18:19 -04:00
lixiaobing10051267
26bd3e8b11 Modify usage of docker exec command in exec.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-30 22:14:55 +08:00
Brian Goff
39c87c79c8 Pass through build APT_MIRROR as separate var 
DOCKER_BUILD_APT_MIRROR

This allows passthrough of other options like HTTP_PROXY from
DOCKER_BUILD_ARGS to work on all builds (for example,
ensure-syscall-test) when APT_MIRROR is set.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-08-30 09:09:31 -04:00
Brian Goff
edafc642b2 Merge pull request #25890 from cpuguy83/fix_swarm_control_sock_path 
Use daemon exec root for swarm control socket
 2016-08-30 08:51:52 -04:00
Justin Cormack
644cb53b41 Merge pull request #26096 from ohmystack/fix/docs-dockerd 
Add docs for "--containerd" in dockerd
 2016-08-30 13:36:50 +01:00
Vincent Demeester
4e1eb10cf2 Merge pull request #26124 from darrenstahlmsft/RestoreLock 
Lock concurrent access to remove map during Daemon restore
 2016-08-30 13:06:01 +02:00
allencloud
b13f5dfd13 make node ps default to self in swarm node 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-30 17:34:16 +08:00
Vincent Demeester
92da332638 Merge pull request #25521 from allencloud/modify-vendor-script 
better vendor.sh to break when fail in grep
 2016-08-30 11:26:41 +02:00
Vincent Demeester
6e09e142a1 Merge pull request #26093 from yongtang/26090-service-update-with-name 
Fix issue in API `POST /services/(id or name)/update`
 2016-08-30 11:11:08 +02:00
Vincent Demeester
20869b5650 Merge pull request #26135 from kmkr/master 
Fix typo in builder.md
 2016-08-30 10:53:50 +02:00
Kris-Mikael Krister
afcfa77dd8 Fix typo in builder.md 
Signed-off-by: Kris-Mikael Krister <krismikael@protonmail.com>
 2016-08-30 09:34:10 +02:00
Yong Tang
80e3975117 Fix issue in API POST /services/(id or name)/update 
This fix tries to address the issue raised in 26090 where
remote API `POST /services/(id or name)/update` cannot
use `name` to update. This is not consistent with the
documentation of the remote API.

This fix fixes this issue by performing a lookup with `getService`
in case `name` instead of `id` is used in API.

This fix adds an integration test to cover the changes.

This fix fixes 26090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-29 21:13:53 -07:00
lixiaobing10051267
3298bfcb56 usage description of docker deploy in md not consistant with go file 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-30 11:40:51 +08:00
ohmystack
cebb9543e1 Add docs for "--containerd" in dockerd 
Signed-off-by: ohmystack <jiangjun1990@gmail.com>
 2016-08-30 10:49:39 +08:00
Tõnis Tiigi
13094ffef9 Merge pull request #26112 from tophj-ibm/alphabetize-makefile-targets 
Alphabetize makefile targets
 2016-08-29 19:00:52 -07:00
Brian Goff
74bfff9798 Merge pull request #26121 from Microsoft/jjh/testattach 
Windows: Enable 2 TestAttach* tests
 2016-08-29 21:09:53 -04:00
Darren Stahl
d665ca8dc0 Lock concurrent access to remove map during Daemon restore 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-08-29 16:58:01 -07:00
John Howard
934fe3f73e Windows: Enable 2 TestAttach* tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-08-29 15:57:27 -07:00
John Howard
bf3d017f08 Merge pull request #26118 from Microsoft/jjh/golintfixes 
Fix golint errors in api
 2016-08-29 15:38:55 -07:00
Brian Goff
2c91c5fdad Merge pull request #25736 from mwieczorek/25689-enable-syslog-driver-on-windows 
Enable syslog driver for windows
 2016-08-29 17:46:12 -04:00
John Howard
c8ce0856b7 Fix golint errors in api 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-08-29 13:36:16 -07:00
Charles Smith
6221592087 Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut 
fixed line spacing in Swarm tutorial bullets
 2016-08-29 12:09:15 -07:00
Victoria Bialas
dcf00020e1 fixed line spacing in Swarm tutorial bullets 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-08-29 11:53:03 -07:00
Christopher Jones
c2775c0b67
Alphabetize makefile targets 
Sorts the makefile targets alphabetically

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-08-29 14:06:45 -04:00
Arnaud Porterie
ec73027b71 Merge pull request #26110 from icecrime/add_anusha_jana 
Add Anusha and Jana as maintainers
 2016-08-29 17:28:21 +00:00
Arnaud Porterie (icecrime)
1a84f0977b
Add Anusha and Jana as maintainers 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-08-29 10:23:50 -07:00
Brian Goff
4edb83f4fd Merge pull request #26079 from allencloud/unpause-container-no-running 
remove running judgement when unpause container
 2016-08-29 10:30:40 -04:00
Brian Goff
4a62f76f9d Merge pull request #26086 from icaoweiwei/patch-2016-08-28-3 
Fix typo
 2016-08-29 10:28:10 -04:00
Brian Goff
d09c04a667 Merge pull request #25317 from yongtang/25304-docker-service-create-group 
Support `--group` in `docker service create`
 2016-08-29 10:27:31 -04:00
Brian Goff
ec5aeca38d Merge pull request #26084 from sdurrheimer/zsh-completion-volume-create-name 
Replace zsh completion for 'docker volume create --name' by 'docker v…
 2016-08-29 10:25:25 -04:00
Brian Goff
3dc19808e0 Merge pull request #26057 from mwieczorek/fix-25903 
fix for PR #25903 - spec file support for Windows plugin discovery
 2016-08-29 09:53:43 -04:00
Vincent Demeester
ad73e8f169 Merge pull request #26080 from sw-double/patch-1 
[docs] Fix volume binding in fluentd container example
 2016-08-29 14:36:49 +02:00
Vincent Demeester
2e752540bf Merge pull request #26101 from allencloud/correct-comments-and-test-log 
correct some nits in comment and test files
 2016-08-29 14:28:47 +02:00
allencloud
52637848a7 correct some nits in comment and test files 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-29 18:37:14 +08:00
allencloud
0bac72e4bd remove running judgement when unpause container 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-29 10:16:18 +08:00