482b3af442
Merge pull request #29281 from anusha-ragunathan/fix_race
...
Fix race in setting plugin refcounts.
Upstream-commit: 86a0de7fa9fe34d29cffc8fcffe0b81b0db78a87
Component: engine
2016-12-09 12:47:39 -08:00
2c58cb78a9
Merge pull request #29275 from cpuguy83/set_inspect_type_emptyfs
...
Set inspect type in ensure-emptyfs
Upstream-commit: f2533c0266f5447dfed9981f2c67c334900afa79
Component: engine
2016-12-09 21:40:58 +01:00
955998db83
Fix race in setting plugin refcounts.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 4c088d1e2ebfcc384a365734017988f4fd1c4605
Component: engine
2016-12-09 09:34:30 -08:00
5b4ba9313b
Merge pull request #28949 from yongtang/28717-docker-plugin-create
...
Use GetByName to check for collision before create any context in plugin creation
Upstream-commit: 9d884986f5c001cacb60aa3c50036575ed2dd22d
Component: engine
2016-12-09 09:12:08 -08:00
4af91ff190
Merge pull request #29231 from Microsoft/jjh/dcocheck
...
Windows: make.ps1 fix DCO check
Upstream-commit: b8e15537656ce64db32b0972ce0c8adbce405bae
Component: engine
2016-12-09 17:07:31 +01:00
ae7e2b46cd
Merge pull request #28976 from miaoyq/remove-a-redundant-func-and-fix-some-typos
...
Remove a redundant funtion and fix some typos
Upstream-commit: b00f1c8623722e45eba420e6d091a24135b0bc0c
Component: engine
2016-12-09 08:44:05 -05:00
45f211246a
Set inspect type in ensure-emptyfs
...
This keeps the test daemon logs from being flooded with calls to lookup
emptyfs for other types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 71ca76e8f20c33d313d2d0dffba0eddf39e69f9e
Component: engine
2016-12-09 08:26:05 -05:00
7272f6fdfe
Merge pull request #29245 from pengqinglan/doc-deprecated
...
fix some version information
Upstream-commit: 98e4a7edb6d8a9a60a510327d4cb1e0da1edebcc
Component: engine
2016-12-09 10:25:50 +01:00
d377a823f5
Merge pull request #29244 from yuexiao-wang/fix-typos-eg
...
Fix a bit typos
Upstream-commit: d1515a5264e7872bfe11543b2b23b4f1eac23f68
Component: engine
2016-12-09 16:03:35 +09:00
2274bcf15c
Merge pull request #29256 from tophj-ibm/ppc64le-move-to-go-bin
...
[ppc64le] use official go 1.7.4 binaries
Upstream-commit: 9aa0c9a2142af249527aa301ddd7e21bc308c624
Component: engine
2016-12-08 15:59:31 -08:00
913e79bf2c
Merge pull request #29224 from vdemeester/check-no-errors
...
Use check in params so we don't ignore errors
Upstream-commit: 7ea31b4034a52ffc67067222e24265d19bcff6ba
Component: engine
2016-12-09 00:26:20 +01:00
475e43a2b7
[ppc64le] use official go 1.7.4 binaries
...
go 1.7.4 introduced official go ppc64le binaries, so use those
instead of using older versions of go and building from src.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 62ab6809bd0a654dde9c076f5a197253c66877e8
Component: engine
2016-12-08 16:18:10 -05:00
aacf384e2f
Merge pull request #28459 from dmcgowan/plugin-repository-pinning
...
Plugin repository pinning
Upstream-commit: c1a1b381f91367afa94a69649d9aa808acecc8ac
Component: engine
2016-12-08 11:28:52 -08:00
fede611756
Merge pull request #25860 from yongtang/1396-service-update-publish-rm
...
Return error for incorrect argument of `service update --publish-rm`
Upstream-commit: 032b5b21b603282e613b6d98da1c7cc2b021a924
Component: engine
2016-12-08 20:09:56 +01:00
795fc21c8b
Fix a bit typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 11454e1c97ed5495e77a06868a0c199d81aa96c3
Component: engine
2016-12-09 03:05:11 +08:00
53aa37ffde
Remove some unused global variables
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 58ad9177d7454893b4b5fca59e4b6b5b9e622308
Component: engine
2016-12-08 19:51:42 +01:00
15fcc0b852
Merge pull request #29142 from tophj-ibm/move-go-to-1.7.4
...
[project] bump go to go 1.7.4
Upstream-commit: 3b31de62b9dcca0def1fca939495d51504162bea
Component: engine
2016-12-08 11:48:34 -05:00
41c08096ed
Merge pull request #28924 from xlgao-zju/fix-apparmor-load-profile
...
fix apparmor load profile
Upstream-commit: 68a423304ec0a9ee590ced5ebbdb27f359cee365
Component: engine
2016-12-08 08:47:27 -08:00
dfc806e15a
Merge pull request #29092 from KingEmet/master
...
Add credential helper documentation
Upstream-commit: 4bc3b4d6aa9f41460bc02f4245ba94e0041ed141
Component: engine
2016-12-08 15:29:35 +01:00
6e67e38b7d
Merge pull request #29020 from wefine/commands_order
...
Give a order to AddCommands, for better read and maintenance.
Upstream-commit: cefda34773e6fbf68f43135f25c00d756bb8cd1a
Component: engine
2016-12-08 15:13:22 +01:00
3185ae49df
Merge pull request #29041 from aaronlehmann/hide-updatestatus
...
api: Hide UpdateStatus when it is not present
Upstream-commit: e94a40cddaca7b920405a730d29892e49f1be19b
Component: engine
2016-12-08 13:55:13 +01:00
1ff39efbfb
Merge pull request #29144 from yongtang/29129-hostname-in-host-mode
...
Fix issue for `--hostname` when running in "--net=host"
Upstream-commit: fee2bb26826ad2be21c66932de12e05a69275970
Component: engine
2016-12-08 12:57:53 +01:00
7ae5702e91
fix some version information
...
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn >
Upstream-commit: aa26364ce1de66b23e51864682cbdadb4a272fa4
Component: engine
2016-12-08 19:03:46 +08:00
cd8309f4a7
Merge pull request #29241 from lixiaobing10051267/masterNetworkLs
...
add SCOPE field content for docker network ls
Upstream-commit: a75cb8c014f5c25031cc4712cfbd8881fa34ee20
Component: engine
2016-12-08 19:03:12 +09:00
25481985f3
Use check in params so we don't ignore errors
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: bcad3d5212641237fe97c9ea2668869805e3bce8
Component: engine
2016-12-08 10:56:29 +01:00
c7b83e6391
add SCOPE field content for docker network ls
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 170fcead7ecd0dbe323d727a2afd3e2694e6af29
Component: engine
2016-12-08 17:13:38 +08:00
886e681533
Give a order to AddCommands, for easy read and maintenance.
...
Signed-off-by: wefine <wang.xiaoren@zte.com.cn >
Upstream-commit: 6174adc4b391fe3d1e79173a7f351938d0e1edd9
Component: engine
2016-12-08 16:43:14 +08:00
b5c8edab7f
add break when found in TestVolumeCLICreateWithOpts()
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: feadc5171a9ea5489964b0639135a1bd00e0eb8a
Component: engine
2016-12-08 15:59:52 +08:00
ef878bf7f4
[project] bump go to go 1.7.4
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 20e243780ef3b6a7d1debca6279e06b003895121
Component: engine
2016-12-07 22:22:39 -05:00
14c40e7945
Windows: make.ps1 fix DCO check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e538c1fdca16cadf59f1d19df75857c8b2c4af06
Component: engine
2016-12-07 17:58:07 -08:00
a09c35f1e8
Merge pull request #29191 from anusha-ragunathan/plugin_races
...
Make v2/Plugin accesses safe.
Upstream-commit: 9d898b872ebe953cab1b60366253f1a9210764cc
Component: engine
2016-12-07 17:52:44 -08:00
b5155284d2
Merge pull request #29104 from duglin/Issue29084
...
Fix processing of unset build-args during build
Upstream-commit: dca76ed50a02659ba7ca4e209356f138ff14dc3e
Component: engine
2016-12-07 17:18:55 -08:00
8efa0bf248
Merge pull request #29124 from ijc25/check-config-legacy-vsyscall
...
Caution against the use of CONFIG_LEGACY_VSYSCALL_NATIVE
Upstream-commit: 1e92365a5fcfbbc9932abc8642a32cc3493eb2be
Component: engine
2016-12-07 17:13:55 -08:00
e048bb17f7
Merge pull request #29139 from ehazlett/fix-api-cors-exec
...
Add headers when using exec
Upstream-commit: a039ca9affe5fa40c4e029d7aae399b26d433fe9
Component: engine
2016-12-07 17:10:31 -08:00
748c245257
Merge pull request #29190 from aaronlehmann/remove-registry-reference
...
registry: Remove reference.go
Upstream-commit: c7d34a0ca5035788810660b840ceec098b698bd4
Component: engine
2016-12-07 16:53:52 -08:00
7f7cf89101
Merge pull request #29213 from yongtang/12072016-typo-swagger-yaml
...
Fix a couple of incorrect version strings in swagger.yaml
Upstream-commit: 51b422ce6a398b579d97c2c3ae746275bd7204e5
Component: engine
2016-12-07 16:47:49 -08:00
5c01c889af
Merge pull request #29200 from coolljt0725/fix_attach
...
fix #29199 , reset container if container start failed
Upstream-commit: a42ca21f50d79beae04df3ceb47496dbed7632fd
Component: engine
2016-12-07 15:21:28 -08:00
2a1f61f581
Merge pull request #29062 from erxian/refine-api-swagger.yaml-towards-image-create-status-code
...
refine api swagger.yaml towards image create status code
Upstream-commit: 9468d687ac924db8df95fd8d2bcbe7facafb8c2d
Component: engine
2016-12-07 22:03:54 +01:00
405972988b
Add credential helper documentation
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: 68211f4cb45baca957fef625ba3bb0c422dd20ec
Component: engine
2016-12-07 10:14:28 -08:00
69c140812c
Merge pull request #29174 from lhsvobodaj/29132-add-build-args-to-build-deb-script
...
Add variable DOCKER_BUILD_ARGS to build-deb script
Upstream-commit: 74ecec9199a2f1e9ff1ce52e254c8de65882ab4a
Component: engine
2016-12-07 09:02:47 -08:00
5e6532a1b8
Fix a couple of incorrect version string in swagger.yaml
...
This fix fixes a couple of incorrect version strings in swagger.yaml
`v1.25` should be `v1.26`. This applies to 1.14 version only.
Also checked 1.13rc and it is fine.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 887c4188f469698938213eddd1babf224cc39737
Component: engine
2016-12-07 08:11:12 -08:00
ce009b27d8
Fix processing of unset build-args during build
...
This reverts 26103. 26103 was trying to make it so that if someone did:
docker build --build-arg FOO .
and FOO wasn't set as an env var then it would pick-up FOO from the
Dockerfile's ARG cmd. However, it went too far and removed the ability
to specify a build arg w/o any value. Meaning it required the --build-arg
param to always be in the form "name=value", and not just "name".
This PR does the right fix - it allows just "name" and it'll grab the value
from the env vars if set. If "name" isn't set in the env then it still needs
to send "name" to the server so that a warning can be printed about an
unused --build-arg. And this is why buildArgs in the options is now a
*string instead of just a string - 'nil' == mentioned but no value.
Closes #29084
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: cdb8ea90b04683adb25c8ccd71b6eaedc44b51e2
Component: engine
2016-12-07 07:41:55 -08:00
1a51a9823b
Merge pull request #29195 from vdemeester/integration-test-shell-dont-run-if-compilation-failure
...
Make sure we don't run integration cli test if compilation fails
Upstream-commit: 8b7d0764256f8476e4adeba2fb0b8a2d5558f25a
Component: engine
2016-12-07 10:35:30 -05:00
0856573894
Merge pull request #29061 from allencloud/forbid-leave-when-swarm-locked
...
not export errors and forbid leave without --force when unlocked
Upstream-commit: 145fa7781777080b29b2eb9597f0789b6638a91a
Component: engine
2016-12-07 10:30:28 -05:00
f4ce4909fe
Merge pull request #29201 from lixiaobing10051267/masterVar4
...
modify URLs for bind docker in docs/api
Upstream-commit: 9b91c7e423062455d7bbb9e33d7e7812dd64ab22
Component: engine
2016-12-07 16:30:02 +01:00
a7b2b7037a
Add zsh completion for 'docker network create --attachable'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: bce11a29f822e18ef2bac28f147b5506f785e4cc
Component: engine
2016-12-07 08:09:42 +01:00
e148b77b83
modify URLs for bind docker in docs/api
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9c76fb253ecc53cc54d196a4460d8e1d91c1683d
Component: engine
2016-12-07 15:06:16 +08:00
b1cf7fa923
fix #29199 , reset container if container start failed
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e806821b53f9ca1f1a3d933e7bbfe04a5566a3bf
Component: engine
2016-12-07 01:37:08 -05:00
ed60722124
not export errors and forbid leave when unlocked
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7bdd1a4f9c06ab4af8e652b7483104456e72c442
Component: engine
2016-12-07 13:25:34 +08:00
afe61e5090
refine api swagger.yaml towards image create status code
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 15be050fb307d0da1521767a6f53d9b95429396b
Component: engine
2016-12-07 10:27:40 +08:00
