e12f9af05e
COPY file . after WORKDIR (now always created)
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 286ab6d69bb999f5fcbdfdcac50bb8d65bb50c56
Component: engine
2016-11-23 09:56:02 -08:00
c8210e7c2f
Merge pull request #28290 from KevinTHU/master
...
fix "fatal error: concurrent map read and map write" bugs when we concurrently execute lots of delete volumes and create or list volumes tasks
Upstream-commit: 31a050e31b6d49481d9e3ba96c0b67b1574a0e76
Component: engine
2016-11-17 13:59:09 -05:00
f2f46094c2
Merge pull request #28523 from yongtang/28519-service-inspect-pretty-crash
...
Fix crash caused by `docker service inspect --pretty`
Upstream-commit: 6d0f7bb4c718cbd0ae8e80bb1e974e7632d03d75
Component: engine
2016-11-17 10:56:57 -08:00
d4244fefc2
Merge pull request #28415 from Microsoft/jjh/builduser
...
Windows: Allow `USER` in builder
Upstream-commit: 0a5a41a438ae4fef2fc1f8f8935721f1e3f28769
Component: engine
2016-11-17 10:32:56 -08:00
ffe69df229
Merge pull request #28462 from tonistiigi/health-deadlock
...
Fix deadlock on cancelling healthcheck
Upstream-commit: c2fbf0871df2e2e41adc6a08e6bfd47e09e69ff9
Component: engine
2016-11-17 10:30:57 -08:00
1f1e59bbc9
Merge pull request #28536 from allencloud/remove-unused-err-ErrPendingSwarmExists
...
remove unused error ErrPendingSwarmExists
Upstream-commit: 8a6c5358af9cf4485cd2c993a9d4111deb10c81c
Component: engine
2016-11-17 10:17:47 -08:00
6d14b1c8dc
Merge pull request #28526 from aluzzardi/master-revendor-swarmkit
...
[master] Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
Upstream-commit: 57f44b4598a270d9e449780a6ff2aac75d56bb6c
Component: engine
2016-11-17 09:33:18 -05:00
a72341ea0d
Merge pull request #28498 from rhvgoyal/rwlayer-opts
...
Move CreateRWLayer() parameters in a struct
Upstream-commit: 85bc735b4a56223c84971839d819ff8dc494c181
Component: engine
2016-11-17 13:57:59 +01:00
9b39de5905
Merge pull request #28512 from anusha-ragunathan/fix_enable
...
Cleanup after plugin install.
Upstream-commit: a58e3e7fefd67ebe57c183e970e5fcda096c9ad1
Component: engine
2016-11-17 10:16:47 +01:00
aeb7ad65ac
Merge pull request #28534 from cizixs/changelog-typo
...
Fix 1.13.0 changelog typo
Upstream-commit: f47ae61293a69fc0f7d867897b869e7ce4ff4670
Component: engine
2016-11-17 09:57:03 +01:00
40c13459fc
Merge pull request #28521 from aaronlehmann/omitempty
...
api: Remove omitempty tag on Parallelism
Upstream-commit: 465c0484dc9db73fa9578af58e3dddbf94d8fceb
Component: engine
2016-11-17 09:05:29 +01:00
1d59d8efa7
Merge pull request #28530 from stevvooe/derandom-error-codes
...
api/server/httputils: ensure consistent status code
Upstream-commit: e93bd7b8ce01802df25bb83af801a2a45c148cc4
Component: engine
2016-11-16 23:52:52 -08:00
700764fb6d
Fix the typo
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 9551dd03cfad2ec0a00d89c2177fb7b45b6ad885
Component: engine
2016-11-17 14:13:38 +08:00
061156aacb
remove unused error ErrPendingSwarmExists
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7777557a3a8599fbbd8e9a04d7328898c663ded1
Component: engine
2016-11-17 14:06:08 +08:00
8b3a0db514
Fix 1.13.0 changelog typo
...
Signed-off-by: wei wu <wuwei4455@gmail.com >
Upstream-commit: e99e694502b2763b01bc09d5d7c818d9d8ffc991
Component: engine
2016-11-17 12:24:44 +08:00
3c5187452a
api/server/httputils: ensure consistent status code
...
Error code resolution is powered by string matching. Not the greatest
thing in the world and I hope no one is proud of this code, but it
works. However, because a map is used, the iteration order of the map is
random, such that if an error matches two of the snippets, it may return
a different error code depending on the seed of the hashmap. This change
converts it to use a slice instead.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 3484e02590117d175d9c1ab24c583390b4e94a55
Component: engine
2016-11-16 18:58:55 -08:00
2bd4fbcf97
fix bugs 'fatal error: concurrent map read and map write' to change VolumeStore.globalLock type from Mutex to RWMutex, and add globalLock.RLock() for the read of names, refs, labels and options in VolumeStore
...
Signed-off-by: He Xin <he_xinworld@126.com >
Upstream-commit: 19bd1cee236b85d2e24fdf49d6181edb7e1f7f17
Component: engine
2016-11-17 10:48:19 +08:00
01fd03f430
Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: fbe87907597dcea5a5ac493689556873b16a809f
Component: engine
2016-11-16 18:15:15 -08:00
a8652362f7
Fix crash caused by docker service inspect --pretty
...
This fix tries to fix the crash caused by `docker service inspect --pretty`,
by performing necessary nil pointer check.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b6857e91c1625695abbf5897e13f688028880c33
Component: engine
2016-11-16 17:26:03 -08:00
fddeef3e5c
Merge pull request #28505 from Microsoft/jjh/revert27884
...
Windows: Revert 27884
Upstream-commit: 956ff8f773d35181e4408cc0cd2ffa4994d8c1d5
Component: engine
2016-11-16 17:12:19 -08:00
8ad8a4c329
Merge pull request #28100 from nwt/disable-v1-protocol-for-default-registry
...
Disable v1 protocol for the default registry
Upstream-commit: a5dce0cb1ac70924d5f2d8b9e146eee492c2fb5b
Component: engine
2016-11-17 01:25:31 +01:00
33ab332c50
api: Remove omitempty tag on Parallelism
...
It doesn't make sense to use omitempty here. 0 is a meaningful value and
it's different from the default. If someone sets Parallelism to 0, we
want to show that Parallelism is 0, not hide the field.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: d8b8b129948ef8586f5b2f576533952419e302f2
Component: engine
2016-11-16 16:21:25 -08:00
1f521b82ca
Merge pull request #28501 from tonistiigi/fix-daemon-cmd
...
Skip cli initialization for daemon command
Upstream-commit: bb845dbd423e5107dcdba45bb94c4e8d54e5997b
Component: engine
2016-11-16 15:37:43 -08:00
9fe7b62295
Merge pull request #28322 from Microsoft/jjh/api1.26
...
Bump API to v1.26
Upstream-commit: 3f9dc0213583c7e903bebb02733df1e9ec9263b6
Component: engine
2016-11-17 00:01:46 +01:00
455a911a8a
Merge pull request #27749 from riyazdf/plugin-doc-edits
...
Edits to plugin docs after building authz plugin
Upstream-commit: 895bf6b0537ff039f188246e3756312fbec4a59e
Component: engine
2016-11-16 15:01:16 -08:00
6f5b54ba77
Cleanup after plugin install.
...
During error cases, we dont cleanup correctly. This commit takes care
of removing the plugin, if there are errors after the pull passed. It
also shuts down the plugin, if there are errors after the plugin in the
enable path.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 1144f8f1d4b1fd2bbf1f41bf5dad8d929d0dc06e
Component: engine
2016-11-16 14:45:51 -08:00
3e22d4d10e
Windows: Revert 27884
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7e03ce3f13baa61ce5547574163059b712b37025
Component: engine
2016-11-16 13:38:45 -08:00
996cc41e18
Merge pull request #28457 from vieux/proper_error_plugin_windows
...
explicitly show plugins as unsupported on !linux
Upstream-commit: 5659296f15d37c2a8272ab63ed09df47122caf6a
Component: engine
2016-11-16 13:36:21 -08:00
98fb763827
Move CreateRWLayer() parameters in a struct
...
Move some of the optional parameters of CreateRWLayer() in a struct
called CreateRWLayerOpts. This will make it easy to add more options
arguments without having to change signature of CreateRWLayer().
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: f7f3d34210fd8d25a929c6b9048e74e7ee40a558
Component: engine
2016-11-16 16:31:23 -05:00
43c58c892c
Skip cli initialization for daemon command
...
Cli initialization pings back to remote API and
creates a deadlock if socket is already being
listened by systemd.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 5b0a52f7dcd04017a1def7326f8adbb8547ebe89
Component: engine
2016-11-16 13:19:45 -08:00
73004a6b58
Merge pull request #28485 from Microsoft/jjh/remove-make.sh-old-hack
...
Remove old Windows hack in make.sh
Upstream-commit: 77fca662dd71da6be7fd4bb3b40f7074b355607e
Component: engine
2016-11-16 11:38:19 -08:00
397de7b28c
Edits to plugin docs after building authz plugin
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: a524c135dce6ce39ccbca68fdd38f5b575ad82f4
Component: engine
2016-11-16 09:53:23 -08:00
d37cd17630
Merge pull request #28420 from vieux/update_tini
...
update tini to a87614212b3a51a9cad57ff7989103a841546745
Upstream-commit: 1c29c3a54d7194148d569ef2cbac53dbc12a5165
Component: engine
2016-11-16 09:46:11 -08:00
a498054fff
Remove old Windows hack in make.sh
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5e6f8cb4a7f8bf294b3b459d2c2afed6d69fcdf1
Component: engine
2016-11-16 09:29:38 -08:00
7acf8456de
Merge pull request #27631 from allencloud/get-node-brefore-update
...
allow node update API to receive node name and id prefix
Upstream-commit: 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Component: engine
2016-11-16 17:47:31 +01:00
107032adcb
Merge pull request #28467 from miaoyq/del-redundant-logical-judgmont-statement
...
Remove redundant 'if' statement
Upstream-commit: 4dff5381180d25c9037175c3344902008e15e00c
Component: engine
2016-11-16 11:34:40 -05:00
fe596a946e
Merge pull request #28475 from vdemeester/update-stats-reference
...
Update stats cli reference documentation
Upstream-commit: 9057294e4c9519b096808f30128aeecc43eb4d92
Component: engine
2016-11-16 17:25:52 +01:00
a086b9b802
Update stats cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 947464e2f1a8df9addce4911f4c1264b2c606543
Component: engine
2016-11-16 15:26:29 +01:00
c3410356d7
Merge pull request #28440 from cpuguy83/20740_fix_tmpfs_parsing_on_client
...
Don't validate platform-dep tmpfs opts on client
Upstream-commit: 4549e9104cef53ff51a194bc47896a041bf18418
Component: engine
2016-11-16 12:04:14 +00:00
6e80fcc7bb
Merge pull request #28346 from yongtang/11122016-docs-api-version
...
Fix missing versions in example requests of api docs
Upstream-commit: 297f2fd445a751813780a82a254b9aafc6ab6498
Component: engine
2016-11-16 12:15:05 +01:00
a76e66dfce
Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs
...
Update docs for `docker info` for most recent changes.
Upstream-commit: cd2d52b5f6746ab83b835390fc6eb1f13dabde48
Component: engine
2016-11-16 12:08:35 +01:00
ded6480e13
Merge pull request #28471 from lixiaobing10051267/masterLogGroupName
...
function TestCreateSuccess uses a wrong variable LogGroupName
Upstream-commit: d60cb82ca527382d9ea5eba3f8fea8889ea645cf
Component: engine
2016-11-16 12:06:15 +01:00
ba567e9b07
Remove redundant 'if' statement
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: d63dc45f0b34be6e25592ea6322a462497a89507
Component: engine
2016-11-16 16:50:54 +08:00
166b57151d
function TestCreateSuccess uses a wrong variable LogGroupName
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 320c93824b7c4dca3086258264ab142fe4530165
Component: engine
2016-11-16 16:48:36 +08:00
2b59e6eef5
Add zsh completion for 'docker system df'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 70fdbff5f077e01897b8d284d1e29de64f8041eb
Component: engine
2016-11-16 08:39:21 +01:00
7c64e36522
Fix deadlock on cancelling healthcheck
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 89b123473774248fc3a0356dd3ce5b116cc69b29
Component: engine
2016-11-15 20:10:16 -08:00
d6be8a084e
Merge pull request #28447 from nishanttotla/use-distribution-reference-pkg
...
Using distribution reference pkg (pin image by digest)
Upstream-commit: 6697fa8a68db41162063df90f54f8b039d4ca4a1
Component: engine
2016-11-15 20:05:26 -08:00
0d115ba911
allow node update api receive node name and id prefix
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: d075b83dd6e5bbd4470400d44889ca71cf9dbd59
Component: engine
2016-11-16 10:18:19 +08:00
09955b008f
Merge pull request #28444 from allencloud/move-getNetwork-func-into-helper-gofile
...
move func getNetwork into helper.go to keep consistent
Upstream-commit: ff2de8dace1ba1c1f5e8542790ef5cd564375934
Component: engine
2016-11-15 17:03:23 -08:00
9f2af5ec1b
explicitly show plugins as unsupported on !linux
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: a8139460ff98b081c06ecf28a821d6f456d9a079
Component: engine
2016-11-15 16:47:30 -08:00
