Vincent Demeester
c73fae2352
Merge pull request #26290 from tonistiigi/govet17
...
Fix govet for go1.7
2016-09-03 19:27:19 +02:00
Tonis Tiigi
7a8c7b47cf
Fix govet for go1.7
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-09-02 19:07:54 -07:00
Daniel Nephin
2e0bc0393a
Merge pull request #26225 from yongtang/26173-docker-import-quoted-change
...
Fix issue in `docker import -c` with quoted flags
2016-09-02 13:34:25 -04:00
Brian Goff
75f589a979
Merge pull request #26254 from tophj-ibm/change-ppc64le-dockerfile-to-golang
...
ppc64le: change dockerfile base from gcc to golang
2016-09-02 10:05:39 -04:00
Antonio Murdaca
b98e918248
Merge pull request #26264 from q384566678/test-two
...
Modify docker-restart.1.md
2016-09-02 15:53:19 +02:00
Brian Goff
84ebbb5231
Merge pull request #26261 from Microsoft/jjh/morebuildtests
...
Windows CI: Enable some more build tests
2016-09-02 09:41:08 -04:00
Vincent Demeester
1a04d7b1e1
Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
...
update docs/reference/commandline/service_create.md
2016-09-02 12:39:31 +02:00
Akihiro Suda
aa47961682
update docs/reference/commandline/service_create.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-02 09:59:20 +00:00
Justin Cormack
9d71cba5f0
Merge pull request #24510 from runcom/new-seccomp-format
...
New seccomp json format
2016-09-02 09:14:01 +01:00
zhouhao
b99cf0de47
Modify docker-restart.1.md
...
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
2016-09-02 13:06:08 +08:00
Yong Tang
a79a27412d
Fix issue in `docker import -c` with quoted flags
...
This fix tries to address the issue in 26173 where `docker import -c`
with quoted flags returns an error.
The issue was that in `api/client/image/import.go` the flag
`--change/-c` was handled by `StringSliceVarP` which does not handle
the quote well.
The similiar issue was enountered for 23309 (`docker commit`).
This fix takes the same approach as 23309 where `StringSliceVarP`
was replaced with `VarP` and `opts.ListOpts`.
An integration test has been added to cover the changes.
This fix fixes 26173.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-01 16:28:22 -07:00
John Howard
ede6163ec6
Windows CI: Enable some more build tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-01 16:27:04 -07:00
Christopher Jones
a243f35cf8
ppc64le: change dockerfile base from gcc to golang
...
Now that gccgo isn't supported, change the ppc64le dockerfile base image
from a debian:jessie based + gccgo image to a debian:jessie + golang image.
Also includes a go path change to be more consistent across Dockerfiles.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-09-01 16:51:11 -04:00
Vincent Demeester
b14f29dfbd
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
2016-09-01 20:53:07 +02:00
Vincent Demeester
baf2108baf
Merge pull request #26242 from YuPengZTE/devEG
...
"eg." should be "e.g."
2016-09-01 20:46:46 +02:00
Vincent Demeester
a19bdec6f0
Merge pull request #26172 from Microsoft/jjh/testinspect
...
Windows: Enable multiple TestInspect tests
2016-09-01 19:46:19 +02:00
Tõnis Tiigi
83fc63f967
Merge pull request #26077 from runcom/fix-TestImportBadURL
...
integration-cli: fix TestImportBadURL w/o network
2016-09-01 09:30:02 -07:00
Vincent Demeester
8abaf62715
Merge pull request #26226 from YuPengZTE/devTest
...
The first letter should be small in errors.New
2016-09-01 17:28:32 +02:00
Antonio Murdaca
5ff21add06
New seccomp format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-01 11:53:07 +02:00
Justin Cormack
8ccac1ad4d
Merge pull request #26200 from runcom/engine-api-vendor
...
vendor docker/engine-api@f9cef59044
2016-09-01 10:51:34 +01:00
YuPengZTE
e4ac375fdb
eg. should be e.g.
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-01 17:44:35 +08:00
YuPengZTE
e0e62874bb
The first letter docker is small
2016-09-01 17:03:01 +08:00
Vincent Demeester
f173555de8
Merge pull request #26180 from yongtang/25943-validate-ip6
...
Fix issue in `--ip6` validation for `docker create`
2016-09-01 11:02:16 +02:00
Vincent Demeester
b8d510e86a
Merge pull request #26181 from yongtang/08302016-DockerDaemonSuite-NewDaemon
...
Change related test from DockerSuite to DockerDaemonSuite in `docker_cli_daemon_test.go`
2016-09-01 09:42:59 +02:00
YuPengZTE
e7935da239
The first letter should be small in errors.New
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-01 11:26:40 +08:00
Brian Goff
7776a0ebd7
Merge pull request #26186 from ywk253100/master
...
Fixes #25654 , a bug in implements of loading image
2016-08-31 22:07:01 -04:00
Tõnis Tiigi
beba6ea311
Merge pull request #26211 from aaronlehmann/no-advertise-addr-detection-on-join
...
cluster: Do not autodetect advertise address on join
2016-08-31 17:19:23 -07:00
Arnaud Porterie
5a56f29c64
Merge pull request #26208 from talex5/fix-health-test
...
Fix exec form of HEALTHCHECK CMD
2016-08-31 23:27:39 +00:00
Tõnis Tiigi
bdae52a23d
Merge pull request #26214 from tonistiigi/revert-daemonsuite-fix
...
Revert "Change related tests from DockerSuite to DockerDaemonSuite in…
2016-08-31 14:16:39 -07:00
Antonio Murdaca
8f7a8c75ae
vendor docker/engine-api@f9cef59044
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-31 22:39:13 +02:00
Vincent Demeester
243d4dcc7e
Merge pull request #26206 from crosbymichael/py-xunit
...
Output docker-py test results in xunit format
2016-08-31 21:48:47 +02:00
Vincent Demeester
6ac30e57d0
Merge pull request #26191 from runcom/fix-unknownflag-exit-code
...
api: client: container: update: fix help text
2016-08-31 21:15:51 +02:00
Tibor Vass
e3bc989a9d
Merge pull request #26058 from anusha-ragunathan/add-pluginstore
...
Reorganize plugin package into sub packages.
2016-08-31 11:58:34 -07:00
Tonis Tiigi
f0e9997287
Revert "Change related tests from DockerSuite to DockerDaemonSuite in `docker_cli_info_test.go`"
...
This reverts commit 0ce5ef279c
.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-31 11:52:22 -07:00
Aaron Lehmann
b1d2b08853
cluster: Do not autodetect advertise address on join
...
On join, remote addresses are supposed to be detected by the manager
that receives the join request. However, the daemon is interfering with
this by automatically detecting an advertise address and specifying that
to the remote manager. Fix this so that an advertise address is only
specified while joining a cluster if one was given by the user.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-08-31 11:44:32 -07:00
Thomas Leonard
e95b6b51da
Fix exec form of HEALTHCHECK CMD
...
We attached the JSON flag to the wrong AST node, causing Docker to treat
the exec form ["binary", "arg"] as if the shell form "binary arg" had
been used. This failed if "ls" was not present.
Added a test to detect this.
Fixes #26174
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
2016-08-31 17:50:12 +01:00
Michael Crosby
a9e513867c
Output docker-py test results in xunit format
...
This adds a `results.xml` to the test-docker-py output folder.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-31 09:35:49 -07:00
Michael Crosby
b42ab41b8f
Merge pull request #25616 from rhatdan/overlay_selinux
...
Linux upstream kernel Overlay file systems support SELinux
2016-08-31 09:25:20 -07:00
Justin Cormack
ad6f5a49d5
Merge pull request #26139 from yuexiao-wang/fix-link
...
Modify link for hub and registry
2016-08-31 16:37:50 +01:00
John Howard
3ae6cd453e
Windows: Enable multiple TestInspect tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-31 08:12:50 -07:00
Vincent Demeester
ba23bf202a
Merge pull request #26182 from yuexiao-wang/add-options
...
Miss the options in some commands
2016-08-31 14:45:42 +02:00
Vincent Demeester
cf699ad427
Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
...
make command "docker plugin inspect" complete
2016-08-31 14:42:03 +02:00
Vincent Demeester
37fd1416da
Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
...
provide actual command format for docker network create
2016-08-31 14:41:49 +02:00
Vincent Demeester
670eaa71a0
Merge pull request #26187 from albers/docs-volume-create-fix
...
Fix argument order for docker create in tutorial
2016-08-31 14:41:22 +02:00
Vincent Demeester
0414a2c1a9
Merge pull request #26185 from yuexiao-wang/update-docs
...
Update description for docker plugin inspect
2016-08-31 14:41:03 +02:00
lixiaobing10051267
d022bb2084
make command "docker plugin inspect" complete
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-31 19:59:23 +08:00
Antonio Murdaca
c2c2617534
api: client: container: update: fix help text
...
Before:
$ docker update --cpu-period
Status: flag needs an argument: --cpu-period
See 'docker update --help'., Code: 125
After:
$ docker update --cpu-period
flag needs an argument: --cpu-period
See 'docker update --help'.
Also remove flagErrorFunc function which isn't needed anymore.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-31 12:46:40 +02:00
lixiaobing10051267
18a9600fb1
provide actual command format for docker network create
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-31 17:40:13 +08:00
yuexiao-wang
fdedc38f0c
Update description for docker plugin inspect
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-31 16:57:44 +08:00
Lei Jitang
4e7cbb91f8
Merge pull request #26188 from albers/completion-volume-create-name
...
Remove bash completion for `docker volume create --name`
2016-08-31 16:57:32 +08:00