ba11bf3dd5
Windows: Enable some cp integration tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 088c3eeea8ae6e46bf698d0c99c98b92bc894063
Component: engine
2016-08-30 14:32:10 -07:00
db247f3de4
Merge pull request #26020 from tonistiigi/fix-eventsbefore-test
...
Fix flaky TestEventsContainerFilterBeforeCreate
Upstream-commit: 73614f9f1e606cd9282589d11481d01c21dfe3fe
Component: engine
2016-08-30 22:24:52 +02:00
cf98ba1499
Merge pull request #26153 from Microsoft/jjh/testcommitcli
...
Windows: Enable some commit tests
Upstream-commit: cf3e834c9b0e7f48959c099dc983f3d1f6ccb18d
Component: engine
2016-08-30 22:17:20 +02:00
58d79a8716
Merge pull request #26145 from allencloud/update-command-description
...
update command description
Upstream-commit: 19aee549269ab7e7a025aaf7b820577f52dc4443
Component: engine
2016-08-30 22:16:57 +02:00
341c5e093f
Merge pull request #26147 from Microsoft/jjh/testbuildapi
...
Windows: Enable 5 Build API tests
Upstream-commit: 8a46c18dd4e4f8091b9e02ef5b476e8b8aa77c47
Component: engine
2016-08-30 22:12:36 +02:00
b4e6ad86f8
Merge pull request #26149 from Microsoft/jjh/testbuildcli
...
Windows: Enable multiple cli build tests
Upstream-commit: 16148d04207c131b2fe01f35301d58d2609a1b54
Component: engine
2016-08-30 22:12:24 +02:00
4d00b3694e
Merge pull request #26151 from Microsoft/jjh/testbuildhistory
...
Windows: Enable docker_cli_history_test.go tests
Upstream-commit: 783fe398dc5a60ab4b64c6a024f8190fd5b57327
Component: engine
2016-08-30 11:58:31 -07:00
873d669a48
Windows: Enable multiple cli build tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bb4b31585c19b5d20a536c615e54b2fe48f8054c
Component: engine
2016-08-30 09:51:13 -07:00
3fb9dd8f96
Windows: Enable some commit tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ac59dfa761b0681cb67d11184ef62cc16ec93570
Component: engine
2016-08-30 09:48:18 -07:00
0957712290
Windows: Enable docker_cli_history_test
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a06c695177016398e434b0436268c38c3f4c112d
Component: engine
2016-08-30 09:31:33 -07:00
0496cb3f89
Windows: Enable 5 Build API tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8bc1c9c08a09b7f47d8429645a061cb29fb8118e
Component: engine
2016-08-30 08:41:17 -07:00
691c290c4d
Merge pull request #26123 from cpuguy83/revert_makefile_build_args
...
Fix passing custom APT_MIRROR on building Docker
Upstream-commit: 5c2064f890fb1fa5f3642ae135e5145d4bd0ae13
Component: engine
2016-08-30 17:30:48 +02:00
44b8f27e57
Merge pull request #26134 from lixiaobing10051267/masterDockerExec
...
Modify use of docker exec command in exec.go
Upstream-commit: 5bd14f88cdb38978c28b015ddc0ce343b72b408b
Component: engine
2016-08-30 08:27:02 -07:00
feabcf715e
update command description
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 123ce0e4be7c2743c5dee0a9aff84cd2c23758e0
Component: engine
2016-08-30 23:07:42 +08:00
1f1420a059
Merge pull request #25214 from allencloud/make-node-ps-default-to-self
...
make node ps default to self in swarm node
Upstream-commit: bb1d70da9ad5804794b7aea77abe59fb9e3ac196
Component: engine
2016-08-30 10:37:20 -04:00
db8a613cf1
Merge pull request #26127 from lixiaobing10051267/masterDockerDeploy
...
usage description of docker deploy in md not consistant with go file
Upstream-commit: afd54a1a8645bde7d5d87efc5567ee0d3c788e78
Component: engine
2016-08-30 10:18:19 -04:00
0ecc84d963
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 >
Upstream-commit: 26bd3e8b11dd9ef9a8226341ed04cbc8a58776cc
Component: engine
2016-08-30 22:14:55 +08:00
82132c60b7
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 >
Upstream-commit: 39c87c79c848456aaa12a6ecfd658a9e94f94d65
Component: engine
2016-08-30 09:09:31 -04:00
6e19944380
Merge pull request #25890 from cpuguy83/fix_swarm_control_sock_path
...
Use daemon exec root for swarm control socket
Upstream-commit: edafc642b2b12d7428e72f922a2b44c3b62ffc31
Component: engine
2016-08-30 08:51:52 -04:00
1b0ecb4bfa
Merge pull request #26096 from ohmystack/fix/docs-dockerd
...
Add docs for "--containerd" in dockerd
Upstream-commit: 644cb53b41b49fd750fe9c86e922125ef8156259
Component: engine
2016-08-30 13:36:50 +01:00
d4a3fcb2c8
Merge pull request #26124 from darrenstahlmsft/RestoreLock
...
Lock concurrent access to remove map during Daemon restore
Upstream-commit: 4e1eb10cf28c109ca887408155d84a847aa233fc
Component: engine
2016-08-30 13:06:01 +02:00
37e3bbaff0
make node ps default to self in swarm node
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b13f5dfd130a69b0eb655d349b7839f12a9384ed
Component: engine
2016-08-30 17:34:16 +08:00
4cd762346d
Merge pull request #25521 from allencloud/modify-vendor-script
...
better vendor.sh to break when fail in grep
Upstream-commit: 92da332638597cf424090b16a90435ea4601891a
Component: engine
2016-08-30 11:26:41 +02:00
d43b3ba23f
Merge pull request #26093 from yongtang/26090-service-update-with-name
...
Fix issue in API `POST /services/(id or name)/update`
Upstream-commit: 6e09e142a17f2686ebb1a906c53cab593a866ed1
Component: engine
2016-08-30 11:11:08 +02:00
74eaf6c0e0
Merge pull request #26135 from kmkr/master
...
Fix typo in builder.md
Upstream-commit: 20869b5650bd059cd67969f9774fb4eb78b6dbfd
Component: engine
2016-08-30 10:53:50 +02:00
2aa55a3d95
Fix typo in builder.md
...
Signed-off-by: Kris-Mikael Krister <krismikael@protonmail.com >
Upstream-commit: afcfa77dd80defa996d7d0e073d809ac03493f05
Component: engine
2016-08-30 09:34:10 +02:00
6b838755f5
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 >
Upstream-commit: 80e3975117161ae4ce00cc34c7e2b70e45ee43c5
Component: engine
2016-08-29 21:13:53 -07:00
c6f2532e79
usage description of docker deploy in md not consistant with go file
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 3298bfcb56c17cd2a0e123cb10074bcc73e1bba9
Component: engine
2016-08-30 11:40:51 +08:00
73a8f8cdeb
Add docs for "--containerd" in dockerd
...
Signed-off-by: ohmystack <jiangjun1990@gmail.com >
Upstream-commit: cebb9543e1ae2263905562d1c54e380005d5fe4f
Component: engine
2016-08-30 10:49:39 +08:00
acf7387ad5
Merge pull request #26112 from tophj-ibm/alphabetize-makefile-targets
...
Alphabetize makefile targets
Upstream-commit: 13094ffef91e52f1149f90718ae55833eee21b2d
Component: engine
2016-08-29 19:00:52 -07:00
4ea6cdc18d
Merge pull request #26121 from Microsoft/jjh/testattach
...
Windows: Enable 2 TestAttach* tests
Upstream-commit: 74bfff9798607f4d4b8cbd357c10bc4d3d59a3f6
Component: engine
2016-08-29 21:09:53 -04:00
0e11a21138
Lock concurrent access to remove map during Daemon restore
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d665ca8dc053838c5d4d284e13c0f166cd51df6b
Component: engine
2016-08-29 16:58:01 -07:00
6db424fe1d
Windows: Enable 2 TestAttach* tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 934fe3f73ee2afccfa051ade5487e39bfa9e1718
Component: engine
2016-08-29 15:57:27 -07:00
90c3eb8d8e
Merge pull request #26118 from Microsoft/jjh/golintfixes
...
Fix golint errors in api
Upstream-commit: bf3d017f0842c3cc7f65237923604d68ebe01810
Component: engine
2016-08-29 15:38:55 -07:00
6564bc722c
Merge pull request #25736 from mwieczorek/25689-enable-syslog-driver-on-windows
...
Enable syslog driver for windows
Upstream-commit: 2c91c5fdad49ff2103ae377b5b4e1a97ebe3f402
Component: engine
2016-08-29 17:46:12 -04:00
75a4cd19f2
Fix golint errors in api
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c8ce0856b752cecb2f2a2149b79e6e96a63f03dc
Component: engine
2016-08-29 13:36:16 -07:00
ace154f017
Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
...
fixed line spacing in Swarm tutorial bullets
Upstream-commit: 62215920871b8d15a6ffe538baac5abe2b715409
Component: engine
2016-08-29 12:09:15 -07:00
ab43397cd4
fixed line spacing in Swarm tutorial bullets
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: dcf00020e14f3f10b32e3d72196d390f3083d2ee
Component: engine
2016-08-29 11:53:03 -07:00
b2e9b172d4
Alphabetize makefile targets
...
Sorts the makefile targets alphabetically
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: c2775c0b67940467889aa0c20d1be135cbe7623e
Component: engine
2016-08-29 14:06:45 -04:00
76f72c0529
Merge pull request #26110 from icecrime/add_anusha_jana
...
Add Anusha and Jana as maintainers
Upstream-commit: ec73027b719001e1a2695b7cb047cfd0ddc70eb6
Component: engine
2016-08-29 17:28:21 +00:00
fc1ee92165
Add Anusha and Jana as maintainers
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 1a84f0977b83f0c64365649a308fd0d142901636
Component: engine
2016-08-29 10:23:50 -07:00
28302e80b1
Merge pull request #26079 from allencloud/unpause-container-no-running
...
remove running judgement when unpause container
Upstream-commit: 4edb83f4fd7f8fc1b1a6fdbef1cd2367a0f5574c
Component: engine
2016-08-29 10:30:40 -04:00
b901a25ae5
Merge pull request #26086 from icaoweiwei/patch-2016-08-28-3
...
Fix typo
Upstream-commit: 4a62f76f9df1400628cb9398f82eb064b6025acf
Component: engine
2016-08-29 10:28:10 -04:00
edf9053174
Merge pull request #25317 from yongtang/25304-docker-service-create-group
...
Support `--group` in `docker service create`
Upstream-commit: d09c04a667fc2895650b0c2bb25e28fb226e3f31
Component: engine
2016-08-29 10:27:31 -04:00
383b124a13
Merge pull request #26084 from sdurrheimer/zsh-completion-volume-create-name
...
Replace zsh completion for 'docker volume create --name' by 'docker v…
Upstream-commit: ec5aeca38d28b62b0c94799b9fc8e964926080f5
Component: engine
2016-08-29 10:25:25 -04:00
a67f318b1e
Merge pull request #26057 from mwieczorek/fix-25903
...
fix for PR #25903 - spec file support for Windows plugin discovery
Upstream-commit: 3dc19808e01d52b6ebb5e201914863fd6e2d68a2
Component: engine
2016-08-29 09:53:43 -04:00
d155bb2709
Merge pull request #26080 from sw-double/patch-1
...
[docs] Fix volume binding in fluentd container example
Upstream-commit: ad73e8f169ee39ed830bfa385583bddd5741012d
Component: engine
2016-08-29 14:36:49 +02:00
e70aa7c33b
Merge pull request #26101 from allencloud/correct-comments-and-test-log
...
correct some nits in comment and test files
Upstream-commit: 2e752540bf41e8abc4a641a5616890db4159c2d8
Component: engine
2016-08-29 14:28:47 +02:00
17447fd1b0
correct some nits in comment and test files
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 52637848a769b8c80d2f1e28d3d34ada6d35b5a6
Component: engine
2016-08-29 18:37:14 +08:00
c944ae9d41
remove running judgement when unpause container
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0bac72e4bd71b01b5315ff60b71d8bcb1a96949a
Component: engine
2016-08-29 10:16:18 +08:00
