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
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
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
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
ce99f23b28
Merge pull request #28919 from allencloud/change-secret-remove-in-cli
...
change secret remove logic in cli
Upstream-commit: 063d5679c5662c260cd7d53efc10da0a835366e0
Component: engine
2016-11-29 15:08:24 +01:00
8b9cbd5ed5
Merge pull request #28893 from anusha-ragunathan/delete_onerr
...
On plugin pull errors, delete created dirs.
Upstream-commit: c1b0f23de0953e3d36cdd3b510cf6da4ebea6f76
Component: engine
2016-11-29 14:48:27 +01:00
89bc275c16
Merge pull request #28874 from yuexiao-wang/fix-layer-typo
...
Fix some typos
Upstream-commit: 986740691fa38143d8a6ec9d65846feae6221076
Component: engine
2016-11-29 14:45:08 +01:00
bdb282b28d
Fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: c8c7a3ff2112a1b17a06fc02633ed7b49a8aebf3
Component: engine
2016-11-30 03:01:32 +08:00
37d24c3652
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 >
Upstream-commit: 71f1205269494430116e7a564ee76bfa0bfccc63
Component: engine
2016-11-29 21:45:04 +08:00
8074d9c4a5
Merge pull request #28904 from dnephin/add-volume-labels-to-deploy
...
Use namespace label on stack volumes
Upstream-commit: d5654a8e76e9dea770751d02ecfad4123cf724f4
Component: engine
2016-11-29 14:39:26 +01:00
b0adf0fb04
Merge pull request #28819 from yuexiao-wang/modify-link
...
Modify the link about config.json for docker plugin create
Upstream-commit: f06c2f230a6d849ff173f5f943ad77a9bdcacb38
Component: engine
2016-11-29 14:28:32 +01:00
bb120e07d5
Initialize field with name
...
Signed-off-by: Ke Li <kel@splunk.com >
Upstream-commit: da6944ec8747a50941c170186605c8cead517201
Component: engine
2016-11-29 19:36:56 +08:00
c0414c54e6
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 >
Upstream-commit: a754d89b4058d8508cf3cee29f6107b2f93f3001
Component: engine
2016-11-29 09:02:52 +00:00
871bc896d1
Fix docker save with empty timestamp of layer created time
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e0b2c0af4d08b76311d3d57a96f3f55d55f52388
Component: engine
2016-11-29 03:58:23 -05:00
ad81663166
change secret remove logic in cli
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5b93e77138f19d30245a3e0f9f8f834aa67458ec
Component: engine
2016-11-29 15:12:05 +08:00
b455703924
Merge pull request #28909 from Microsoft/jjh/moreworkdir2
...
WORKDIR set cmd
Upstream-commit: 1ef10c83c76281b55b6e790149555d4f5950409c
Component: engine
2016-11-28 20:35:21 -05:00
6eff6aab71
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 >
Upstream-commit: 9dba9e3248f8476d15242ce3ec0bf6d6d50c1a76
Component: engine
2016-11-28 17:19:29 -08:00
fbf2916db8
On plugin pull errors, delete created dirs.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 9e4234261c3e4d13f98218a97d7cc6644723e310
Component: engine
2016-11-28 16:57:27 -08:00
