1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

29664 commits

Author SHA1 Message Date
Anusha Ragunathan
9d884986f5 Merge pull request from yongtang/28717-docker-plugin-create
Use GetByName to check for collision before create any context in plugin creation
2016-12-09 09:12:08 -08:00
Vincent Demeester
b8e1553765 Merge pull request from Microsoft/jjh/dcocheck
Windows: make.ps1 fix DCO check
2016-12-09 17:07:31 +01:00
Brian Goff
b00f1c8623 Merge pull request from miaoyq/remove-a-redundant-func-and-fix-some-typos
Remove a redundant funtion and fix some typos
2016-12-09 08:44:05 -05:00
Vincent Demeester
98e4a7edb6 Merge pull request from pengqinglan/doc-deprecated
fix some version information
2016-12-09 10:25:50 +01:00
Akihiro Suda
d1515a5264 Merge pull request from yuexiao-wang/fix-typos-eg
Fix a bit typos
2016-12-09 16:03:35 +09:00
Victor Vieux
9aa0c9a214 Merge pull request from tophj-ibm/ppc64le-move-to-go-bin
[ppc64le] use official go 1.7.4 binaries
2016-12-08 15:59:31 -08:00
Sebastiaan van Stijn
7ea31b4034 Merge pull request from vdemeester/check-no-errors
Use check in params so we don't ignore errors
2016-12-09 00:26:20 +01:00
Christopher Jones
62ab6809bd
[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>
2016-12-08 16:18:10 -05:00
Victor Vieux
c1a1b381f9 Merge pull request from dmcgowan/plugin-repository-pinning
Plugin repository pinning
2016-12-08 11:28:52 -08:00
Sebastiaan van Stijn
032b5b21b6 Merge pull request from yongtang/1396-service-update-publish-rm
Return error for incorrect argument of `service update --publish-rm`
2016-12-08 20:09:56 +01:00
yuexiao-wang
11454e1c97 Fix a bit typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-09 03:05:11 +08:00
Vincent Demeester
58ad9177d7
Remove some unused global variables
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-08 19:51:42 +01:00
Brian Goff
3b31de62b9 Merge pull request from tophj-ibm/move-go-to-1.7.4
[project] bump go to go 1.7.4
2016-12-08 11:48:34 -05:00
Justin Cormack
68a423304e Merge pull request from xlgao-zju/fix-apparmor-load-profile
fix apparmor load profile
2016-12-08 08:47:27 -08:00
Sebastiaan van Stijn
4bc3b4d6aa Merge pull request from KingEmet/master
Add credential helper documentation
2016-12-08 15:29:35 +01:00
Sebastiaan van Stijn
cefda34773 Merge pull request from wefine/commands_order
Give a order to AddCommands, for better read and maintenance.
2016-12-08 15:13:22 +01:00
Sebastiaan van Stijn
e94a40cdda Merge pull request from aaronlehmann/hide-updatestatus
api: Hide UpdateStatus when it is not present
2016-12-08 13:55:13 +01:00
Sebastiaan van Stijn
fee2bb2682 Merge pull request from yongtang/29129-hostname-in-host-mode
Fix issue for `--hostname` when running in "--net=host"
2016-12-08 12:57:53 +01:00
Qinglan Peng
aa26364ce1 fix some version information
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
2016-12-08 19:03:46 +08:00
Akihiro Suda
a75cb8c014 Merge pull request from lixiaobing10051267/masterNetworkLs
add SCOPE field content for docker network ls
2016-12-08 19:03:12 +09:00
Vincent Demeester
bcad3d5212
Use check in params so we don't ignore errors
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-08 10:56:29 +01:00
lixiaobing10051267
170fcead7e add SCOPE field content for docker network ls
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-08 17:13:38 +08:00
Sebastiaan van Stijn
16157034f6 Merge pull request from lixiaobing10051267/masterBreak
add break when found in TestVolumeCLICreateWithOpts()
2016-12-08 09:58:22 +01:00
wefine
6174adc4b3 Give a order to AddCommands, for easy read and maintenance.
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
2016-12-08 16:43:14 +08:00
lixiaobing10051267
feadc5171a add break when found in TestVolumeCLICreateWithOpts()
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-08 15:59:52 +08:00
Christopher Jones
20e243780e
[project] bump go to go 1.7.4
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-12-07 22:22:39 -05:00
John Howard
e538c1fdca Windows: make.ps1 fix DCO check
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-07 17:58:07 -08:00
Anusha Ragunathan
9d898b872e Merge pull request from anusha-ragunathan/plugin_races
Make v2/Plugin accesses safe.
2016-12-07 17:52:44 -08:00
Tõnis Tiigi
dca76ed50a Merge pull request from duglin/Issue29084
Fix processing of unset build-args during build
2016-12-07 17:18:55 -08:00
Tõnis Tiigi
1e92365a5f Merge pull request from ijc25/check-config-legacy-vsyscall
Caution against the use of CONFIG_LEGACY_VSYSCALL_NATIVE
2016-12-07 17:13:55 -08:00
Tõnis Tiigi
a039ca9aff Merge pull request from ehazlett/fix-api-cors-exec
Add headers when using exec
2016-12-07 17:10:31 -08:00
Tõnis Tiigi
c7d34a0ca5 Merge pull request from aaronlehmann/remove-registry-reference
registry: Remove reference.go
2016-12-07 16:53:52 -08:00
Tõnis Tiigi
51b422ce6a Merge pull request from yongtang/12072016-typo-swagger-yaml
Fix a couple of incorrect version strings in swagger.yaml
2016-12-07 16:47:49 -08:00
Michael Crosby
a42ca21f50 Merge pull request from coolljt0725/fix_attach
fix , reset container if container start failed
2016-12-07 15:21:28 -08:00
Vincent Demeester
9468d687ac Merge pull request from erxian/refine-api-swagger.yaml-towards-image-create-status-code
refine api swagger.yaml towards image create status code
2016-12-07 22:03:54 +01:00
Jake Sanders
68211f4cb4 Add credential helper documentation
Signed-off-by: Jake Sanders <jsand@google.com>
2016-12-07 10:14:28 -08:00
Justin Cormack
74ecec9199 Merge pull request from lhsvobodaj/29132-add-build-args-to-build-deb-script
Add variable DOCKER_BUILD_ARGS to build-deb script
2016-12-07 09:02:47 -08:00
Yong Tang
887c4188f4 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>
2016-12-07 08:11:12 -08:00
Doug Davis
cdb8ea90b0 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 

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-12-07 07:41:55 -08:00
Brian Goff
8b7d076425 Merge pull request from vdemeester/integration-test-shell-dont-run-if-compilation-failure
Make sure we don't run integration cli test if compilation fails
2016-12-07 10:35:30 -05:00
Brian Goff
145fa77817 Merge pull request from allencloud/forbid-leave-when-swarm-locked
not export errors and forbid leave without --force when unlocked
2016-12-07 10:30:28 -05:00
Vincent Demeester
9b91c7e423 Merge pull request from lixiaobing10051267/masterVar4
modify URLs for bind docker in docs/api
2016-12-07 16:30:02 +01:00
Vincent Demeester
d23bb3d083 Merge pull request from sdurrheimer/zsh-completion-network-attachable
Add zsh completion for 'docker network create --attachable'
2016-12-07 09:18:22 +01:00
Steve Durrheimer
bce11a29f8
Add zsh completion for 'docker network create --attachable'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-12-07 08:09:42 +01:00
lixiaobing10051267
9c76fb253e modify URLs for bind docker in docs/api
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-07 15:06:16 +08:00
Lei Jitang
e806821b53 fix , reset container if container start failed
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-12-07 01:37:08 -05:00
allencloud
7bdd1a4f9c not export errors and forbid leave when unlocked
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-07 13:25:34 +08:00
erxian
15be050fb3 refine api swagger.yaml towards image create status code
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-12-07 10:27:40 +08:00
John Howard
9249b29348 Merge pull request from yongtang/29185-docker-inspect-unknown-object
Fix `docker inspect <unkown object>` issue on Windows
2016-12-06 18:23:08 -08:00
Aaron Lehmann
d91ed88365 registry: Remove reference.go
This removes some very old vestigial code that really should have been
removed during the content addressability transition. It implements
something called "reference" but it behaves differently from the actual
reference package. This was only used by client-side content trust code,
and is relatively easy to extricate.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-06 15:53:21 -08:00