Commit graph

29502 commits

Author SHA1 Message Date
lixiaobing10051267
b069690827 modify some urls related to reference path
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-30 16:48:39 +08:00
Vincent Demeester
ccd5e18990 Merge pull request #28961 from daehyeok/refactoring_newV1DependencyImage
Refactoring functions
2016-11-30 09:27:37 +01:00
John Howard
b83076bfc0 Fix incorrect comment
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-29 20:05:47 -08:00
Tõnis Tiigi
1b6352996a 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
2016-11-29 18:32:32 -08:00
Aaron Lehmann
e0702e9f37 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>
2016-11-29 18:13:39 -08:00
lixiaobing10051267
4b9604381a Give the correct location for plugin documentation
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-30 09:52:28 +08:00
Lei Jitang
37db022045 Change Error log to Warning when close stdin fail
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-11-29 20:42:29 -05:00
Lei Jitang
9aedaf5b3a Ignore "failed to close stdin" if container or process not found
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-11-29 20:41:39 -05:00
Tõnis Tiigi
dbe0752157 Merge pull request #28955 from dongluochen/fix_attachable_test
Run overlay attachable test on a single daemon
2016-11-29 17:03:08 -08:00
Brian Goff
4b400ecc4d 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>
2016-11-29 20:00:02 -05:00
Brian Goff
8e0794aae0 Merge pull request #28950 from stevvooe/symlink-check-err
tarexport: check symlink error when saving layer
2016-11-29 19:56:16 -05:00
Daehyeok Mun
d117a2f614 Refactoring functions
Modified newV1DependencyImage and generateDependencyImages not to return
errors instead of always return nil.

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2016-11-29 16:52:37 -07:00
Darren Stahl
dee2968560 Stop retrying pull on UnkownBlob error
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-29 15:06:25 -08:00
Victor Vieux
b8dac5dc99 Merge pull request #28876 from vdemeester/28835-better-handling-of-external-networks
stack deploy: handle external network when deploying
2016-11-29 15:00:35 -08:00
Sebastiaan van Stijn
8c53567720 Merge pull request #28940 from tophj-ibm/ppc64le-add-httpredir
[ppc64le] allow replacing httpredir in dockerfile
2016-11-29 23:29:40 +01:00
Dong Chen
e42d1bb4b2 Run overlay attachable test on a single daemon
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-11-29 14:05:12 -08:00
Sebastiaan van Stijn
f244174664 Merge pull request #27622 from AkihiroSuda/client-set-http-header
client: add accessor methods for client.customHTTPHeaders
2016-11-29 22:18:47 +01:00
Stephen J Day
8616b0690a
tarexport: check symlink error when saving layer
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-11-29 13:08:24 -08:00
Madhu Venugopal
4fae94f663 Merge pull request #28721 from dongluochen/attachable_network
Fix network attachable option
2016-11-29 11:04:49 -08:00
Harald Albers
1076f0882b Add more types to bash completion of docker inspect
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-29 09:45:43 -08:00
Sebastiaan van Stijn
7debf456e3 Merge pull request #28778 from Microsoft/jjh/volumenote
Windows: Note about volumes in run
2016-11-29 17:40:54 +01:00
Anusha Ragunathan
82b35dd997 Merge pull request #28717 from yongtang/28684-duplicate-docker-plugin-create
Fix issue caused by duplicate `docker plugin create` with same names
2016-11-29 08:22:40 -08:00
Christopher Jones
150a519a0b
[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>
2016-11-29 11:06:45 -05:00
Sebastiaan van Stijn
492bc8eb45 Merge pull request #28905 from jlhawn/reject_unspecified_advertise_addr
Reject unspecified advertise addr on swarm init
2016-11-29 16:24:45 +01:00
Vincent Demeester
9387ccc683 Merge pull request #28928 from miaoyq/fix-some-format-err
Fix some format errors
2016-11-29 16:02:35 +01:00
Sebastiaan van Stijn
209c6a419a Merge pull request #28935 from likel/improve-style
Initialize field with name
2016-11-29 15:52:13 +01:00
Sebastiaan van Stijn
82506fe9a9 Merge pull request #28914 from aaronlehmann/cluster-object
cluster: Refuse swarm spec not named "default"
2016-11-29 15:41:05 +01:00
Vincent Demeester
063d5679c5 Merge pull request #28919 from allencloud/change-secret-remove-in-cli
change secret remove logic in cli
2016-11-29 15:08:24 +01:00
Vincent Demeester
c1b0f23de0 Merge pull request #28893 from anusha-ragunathan/delete_onerr
On plugin pull errors, delete created dirs.
2016-11-29 14:48:27 +01:00
Vincent Demeester
986740691f Merge pull request #28874 from yuexiao-wang/fix-layer-typo
Fix some typos
2016-11-29 14:45:08 +01:00
yuexiao-wang
c8c7a3ff21 Fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-30 03:01:32 +08:00
Yanqiang Miao
71f1205269 Fix some format errors
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-29 21:45:04 +08:00
Sebastiaan van Stijn
d5654a8e76 Merge pull request #28904 from dnephin/add-volume-labels-to-deploy
Use namespace label on stack volumes
2016-11-29 14:39:26 +01:00
Sebastiaan van Stijn
f06c2f230a Merge pull request #28819 from yuexiao-wang/modify-link
Modify the link about config.json for docker plugin create
2016-11-29 14:28:32 +01:00
Ke Li
da6944ec87 Initialize field with name
Signed-off-by: Ke Li <kel@splunk.com>
2016-11-29 19:36:56 +08:00
Akihiro Suda
a754d89b40 client: add accessor methods for client.customHTTPHeaders
Added two methods:

 - *Client.CustomHTTPHeaders() map[string]string
 - *Client.SetCustomHTTPHeaders(headers map[string]string)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-11-29 09:02:52 +00:00
Lei Jitang
e0b2c0af4d Fix docker save with empty timestamp of layer created time
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-11-29 03:58:23 -05:00
Vincent Demeester
cee0fff9fe
Revert "Add bash completion for docker service ps --all"
This reverts commit 188d2fac57.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-29 09:33:03 +01:00
allencloud
5b93e77138 change secret remove logic in cli
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-29 15:12:05 +08:00
Doug Davis
1ef10c83c7 Merge pull request #28909 from Microsoft/jjh/moreworkdir2
WORKDIR set cmd
2016-11-28 20:35:21 -05:00
Aaron Lehmann
9dba9e3248 cluster: Refuse swarm spec not named "default"
If, using the API, a user submits an init request with a spec that has a
name other than "default", the engine will rename the "default" cluster
object. Some parts of swarmkit depend on having a cluster object named
"default". Reject any specs that use other names.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-28 17:19:29 -08:00
Anusha Ragunathan
9e4234261c On plugin pull errors, delete created dirs.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-28 16:57:27 -08:00
Dong Chen
abcb699ad1 Fix network attachable option.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-11-28 16:54:56 -08:00
Sebastiaan van Stijn
66154d0888 Merge pull request #28906 from mstanleyjones/udp_port_publishing
Document publishing a UDP port
2016-11-29 00:57:41 +01:00
Brian Goff
0b04f1dca2 Merge pull request #28898 from vdemeester/fix-imagelist-retrocompat
Fixes ImageList to be retro-compatible with older API
2016-11-28 18:57:13 -05:00
John Howard
1b97bb416b WORKDIR set cmd
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-28 15:44:10 -08:00
Josh Hawn
eeac871946 Reject unspecified advertise addr on swarm init
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2016-11-28 15:44:06 -08:00
Misty Stanley-Jones
2178c840ba Document publishing a UDP port
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 15:41:56 -08:00
Tibor Vass
584d23d849 Merge pull request #28897 from anusha-ragunathan/plugin_exit
Fix issue with plugin exit.
2016-11-28 15:25:27 -08:00
Daniel Nephin
4013a7c6d8 Use namespace label on stack volumes.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-28 18:02:39 -05:00