bb58024492
Merge pull request #28797 from miaoyq/fix-a-err-of-logger
...
Fix a error of the function 'CopyMessage' in 'daemon/logger/logger.go'
Upstream-commit: 6151ad19ad2a5cd2ec2c3afc08ed07f64623ae36
Component: engine
2016-11-30 13:27:40 -08:00
5ed6825cff
Merge pull request #28782 from mlaventure/fix-race-in-restore
...
Fix race with containerd events stream on restore
Upstream-commit: e0681ad0fed93876382dad3877bae0171bd43829
Component: engine
2016-11-30 13:26:27 -08:00
6b021be636
Merge pull request #28980 from lixiaobing10051267/masterReference
...
checkt t.Fatalf information for reference path
Upstream-commit: 9d4792798409cb8a1ba00b10296b97da6f7262b8
Component: engine
2016-11-30 21:49:26 +01:00
6c399e963a
Merge pull request #28978 from lixiaobing10051267/masterMan
...
modify some urls related to reference path
Upstream-commit: 4b3740d0094868bd24f81b7be4cab19bad5d93c2
Component: engine
2016-11-30 12:04:00 -08:00
cefbd9b7e9
Merge pull request #28885 from vdemeester/revert-service-ps-all
...
Revert "Add -a option to service/node ps"
Upstream-commit: 53d69aeb74962709464e0888f4a5c755be2c8e4d
Component: engine
2016-11-30 12:02:34 -08:00
a66f1eed5f
Merge pull request #28838 from AkihiroSuda/remove-run-mount
...
[Revert #26825 ] cli: remove `--mount` from `docker run`
Upstream-commit: caaa52c124539acb396c0b711ab95bc7ed459540
Component: engine
2016-11-30 11:56:42 -08:00
ff300e8ad3
Merge pull request #28864 from sdurrheimer/zsh-completion-stack
...
Add zsh completion for 'docker stack' subcommand
Upstream-commit: 466dd8585d468ec9842526ddd5348b4b83127596
Component: engine
2016-11-30 11:56:03 -08:00
c3350bbdd4
Merge pull request #28746 from albers/completion-stack
...
Add bash completion for `docker stack`
Upstream-commit: d9bd5aa1864e97b04f0f1723a275af87f4bcd19c
Component: engine
2016-11-30 11:53:46 -08:00
ed1107ee39
Merge pull request #28784 from thaJeztah/add-some-adjectives
...
Add some adjectives to the namesgenerator
Upstream-commit: 0bf4510a53f09bc55942e5d894f8a1b78b6ac055
Component: engine
2016-11-30 11:46:56 -08:00
746036e7d7
Merge pull request #28975 from mavenugo/ln113
...
Vendoring libnetwork to address some concurrency issues
Upstream-commit: 33b75969023d95592e82db1c2b3f457b627a3694
Component: engine
2016-11-30 11:40:12 -08:00
bbaccfa1ea
Merge pull request #28926 from coolljt0725/fix_save
...
Fix docker save with empty timestamp of layer created time
Upstream-commit: dd20fa60b4cda5132fea68c585a5b4bf0fbc8d51
Component: engine
2016-11-30 11:23:19 -08:00
ba962e129a
Merge pull request #28487 from cpuguy83/stack_dumps
...
Move stack dump dir to exec root
Upstream-commit: 6367c67ab71916d677d3498f0bb536da9ae63597
Component: engine
2016-11-30 20:01:29 +01:00
1dd32f1888
Merge pull request #28965 from cpuguy83/move_plugin_shutdown
...
Move plugin shutdown after layerstore shtudown
Upstream-commit: 9c2f1669a0b556115f543a0f02bf1ea5576b7f71
Component: engine
2016-11-30 10:15:49 -08:00
eb1bfafb6a
Fix race with containerd events stream on restore
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 9fff9bb761b3ceb1ef09ab2d6dbdbaa4463a063c
Component: engine
2016-11-30 10:15:39 -08:00
f823abf46f
Vendoring libnetwork to address some concurrency issues
...
Addresses #28697 , #28845 , #28712 , #26111
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 8f082e418ba662eb700a3a9343371fa6d9c28d5a
Component: engine
2016-11-30 09:31:19 -08:00
2b617fb9ed
Merge pull request #28966 from aaronlehmann/push-panic
...
distribution: Fix panic on push
Upstream-commit: 523ad6ac716e53960a3185c744e5fd7ad30f20d5
Component: engine
2016-11-30 07:26:58 -08:00
0a639f6e9e
Merge pull request #28840 from bfirsh/2016-11-25-api-docs
...
Updates to swagger.yaml and API documentation
Upstream-commit: 643b1c0175206291d8850a87608912d906009a71
Component: engine
2016-11-30 15:49:25 +01:00
443598f3ee
Merge pull request #28972 from Microsoft/jjh/commentcorrection
...
Fix incorrect comment
Upstream-commit: 3676bad0411fafa823165d4510b8091198528288
Component: engine
2016-11-30 08:34:15 -05:00
741407c1aa
Merge pull request #28725 from Microsoft/jjh/builderenvcaseinsensitive
...
Windows: Builder case insensitive env
Upstream-commit: 4a0e295cd1702c36d883b0d2e52c039f407097a2
Component: engine
2016-11-30 08:33:29 -05:00
bd1e79dcf0
checkt t.Fatalf information for reference path
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 4b1ff89faed5a04d1220c2953b8e72eb4e651dcb
Component: engine
2016-11-30 17:54:41 +08:00
6e115a3d71
Merge pull request #28934 from lixiaobing10051267/masterPluginDoc
...
Give the correct location for plugin documentation
Upstream-commit: 6b6cfc63e923dcc7881a194dcb9d294bbbd33d8b
Component: engine
2016-11-30 10:25:46 +01:00
582912f0b8
Merge pull request #28854 from coolljt0725/igore_close_stderr_error
...
Ignore "failed to close stdin" if container or process not found
Upstream-commit: f9ddac3f3cb1edece22f4515671cf9b461975a12
Component: engine
2016-11-30 10:23:27 +01:00
d598152124
Merge pull request #28899 from aaronlehmann/dont-pull-image-id
...
Don't resolve or pull images referenced by ID
Upstream-commit: 768f4ce02b5a2a86ea100d0b875c5949ea652c7d
Component: engine
2016-11-30 10:08:43 +01:00
9ef956d599
Merge pull request #28954 from darrenstahlmsft/UnknownBlobRetry
...
Stop retrying pull on UnkownBlob error
Upstream-commit: b5f4d3f716306c056d12bef3d70563cec720aeee
Component: engine
2016-11-30 10:05:16 +01:00
9ff9e38a6a
modify some urls related to reference path
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: b069690827907681ce781c7cc26a753ffa677b12
Component: engine
2016-11-30 16:48:39 +08:00
61048e49c2
Merge pull request #28961 from daehyeok/refactoring_newV1DependencyImage
...
Refactoring functions
Upstream-commit: ccd5e189904453052699770ab8e532d8a9b9a6b4
Component: engine
2016-11-30 09:27:37 +01:00
6372d2470f
Fix incorrect comment
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b83076bfc076e1c00df40fadda60e1196b786921
Component: engine
2016-11-29 20:05:47 -08:00
a0d0f09c52
Merge pull request #28566 from cyli/more-swarm-encryption-tests
...
Add extra swarm lock/unlock tests that ensure that all the managers are locked with the same key
Upstream-commit: 1b6352996aa71e678ac2c84324f785c424090777
Component: engine
2016-11-29 18:32:32 -08:00
7c1b0ed535
distribution: Fix panic on push
...
When building a manifest during a push operation, all layers must have
an associated descriptor. If a layer is missing a descriptor, that leads
to a panic.
A break inside a switch in layerAlreadyExists meant to break from the
loop surrounding the switch, but instead breaks from the switch. This
causes the loop to continue, and can overwrite the descriptor with an
empty one, leading to the panic.
Also, fix layerAlreadyExists not to abort the push when a speculative
stat on a candidate layer digest fails with an error. This could happen
in situations like a potential cross-repository mount where the user
does not have permission to access the source repository.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: e0702e9f373f5086f53de2485262dde9fc1e7ac2
Component: engine
2016-11-29 18:13:39 -08:00
bb7b3b27e9
Give the correct location for plugin documentation
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 4b9604381a2101c085119f16140544fc413c2958
Component: engine
2016-11-30 09:52:28 +08:00
3723431bd0
Change Error log to Warning when close stdin fail
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 37db0220452a837791af84d044b0b308260dccec
Component: engine
2016-11-29 20:42:29 -05:00
c081d78f0c
Ignore "failed to close stdin" if container or process not found
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9aedaf5b3acc0dd0df4a4b67c46cf922d42f62a3
Component: engine
2016-11-29 20:41:39 -05:00
55f0c36d90
Merge pull request #28955 from dongluochen/fix_attachable_test
...
Run overlay attachable test on a single daemon
Upstream-commit: dbe07521575ce4ec0068651fbbd7746b7aaab87b
Component: engine
2016-11-29 17:03:08 -08:00
c805a193cc
Move plugin shutdown after layerstore shtudown
...
This ensures that graphdriver plugins can properly cleanup on daemon
exit.
Also prevents errors during shutdown when it tries to send the plugin a
`Cleanup()` request but ultimately times out since it's already been
shutdown.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4b400ecc4df4bcf245f1f751a7fd0c9c193d9dbf
Component: engine
2016-11-29 20:00:02 -05:00
8ed173099b
Merge pull request #28950 from stevvooe/symlink-check-err
...
tarexport: check symlink error when saving layer
Upstream-commit: 8e0794aae0c2371be8e2b163e169167a4f5b966c
Component: engine
2016-11-29 19:56:16 -05:00
433038fc01
Refactoring functions
...
Modified newV1DependencyImage and generateDependencyImages not to return
errors instead of always return nil.
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: d117a2f614514a38cc8c3ec97d262213cc78fb63
Component: engine
2016-11-29 16:52:37 -07:00
0a17f3799b
Stop retrying pull on UnkownBlob error
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: dee2968560dba92061ec1acbec7effe94472823f
Component: engine
2016-11-29 15:06:25 -08:00
5ee1b1203e
Merge pull request #28876 from vdemeester/28835-better-handling-of-external-networks
...
stack deploy: handle external network when deploying
Upstream-commit: b8dac5dc995cefbd9f92f5a52a7435ddf4250873
Component: engine
2016-11-29 15:00:35 -08:00
4456d0fe38
Merge pull request #28940 from tophj-ibm/ppc64le-add-httpredir
...
[ppc64le] allow replacing httpredir in dockerfile
Upstream-commit: 8c53567720ab63032e563e5f7fe4e356e94b643c
Component: engine
2016-11-29 23:29:40 +01:00
5acbd9b212
Run overlay attachable test on a single daemon
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: e42d1bb4b229b825a388490f24885f06a7afc401
Component: engine
2016-11-29 14:05:12 -08:00
c42b3b6e0f
Merge pull request #27622 from AkihiroSuda/client-set-http-header
...
client: add accessor methods for client.customHTTPHeaders
Upstream-commit: f24417466457e8846530439c3166eabb38fa8479
Component: engine
2016-11-29 22:18:47 +01:00
0a3180df6c
tarexport: check symlink error when saving layer
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 8616b0690a3ac905fc6ee06ff7524c837fcb8c92
Component: engine
2016-11-29 13:08:24 -08:00
c0fecf9b2a
Merge pull request #28721 from dongluochen/attachable_network
...
Fix network attachable option
Upstream-commit: 4fae94f6637bfbbeba809f930f2ecf1e36748882
Component: engine
2016-11-29 11:04:49 -08:00
8d868f3fc6
Merge pull request #28778 from Microsoft/jjh/volumenote
...
Windows: Note about volumes in run
Upstream-commit: 7debf456e3320f4c84c3f2b2f2a1b914ad77aa40
Component: engine
2016-11-29 17:40:54 +01:00
7517d3b3a5
Merge pull request #28717 from yongtang/28684-duplicate-docker-plugin-create
...
Fix issue caused by duplicate `docker plugin create` with same names
Upstream-commit: 82b35dd997f46ff430cb084c962089c40f5bc96a
Component: engine
2016-11-29 08:22:40 -08:00
db703b35d8
[ppc64le] allow replacing httpredir in dockerfile
...
Allows replacing of the default httpredir.debian.org in /etc/apt/sources.list
with a user-specified mirror. This will (hopefully) fix CI apt issues.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 150a519a0b267cccaacb4b8038787e2b512fe17e
Component: engine
2016-11-29 11:06:45 -05:00
17f785da28
Merge pull request #28905 from jlhawn/reject_unspecified_advertise_addr
...
Reject unspecified advertise addr on swarm init
Upstream-commit: 492bc8eb457cfbf914b762df0b584f668be4a628
Component: engine
2016-11-29 16:24:45 +01:00
c5d7f73b75
Merge pull request #28928 from miaoyq/fix-some-format-err
...
Fix some format errors
Upstream-commit: 9387ccc68370b2c62d81691940cc9f7fffa2b28a
Component: engine
2016-11-29 16:02:35 +01:00
852751f7da
Merge pull request #28935 from likel/improve-style
...
Initialize field with name
Upstream-commit: 209c6a419aac4952bef2fedc8f941130305e6e54
Component: engine
2016-11-29 15:52:13 +01:00
66227b770b
Merge pull request #28914 from aaronlehmann/cluster-object
...
cluster: Refuse swarm spec not named "default"
Upstream-commit: 82506fe9a97781c65544c6e769e974cd82b28fc2
Component: engine
2016-11-29 15:41:05 +01:00
