Vincent Demeester
637e45cd56
Merge pull request #26290 from tonistiigi/govet17
...
Fix govet for go1.7
Upstream-commit: c73fae2352788323476759f4199b034b7ffc54dd
Component: engine
2016-09-03 19:27:19 +02:00
Petr Švihlík
8c44f51734
Updated Windows mounting example
...
Signed-off-by: Petr Švihlík <svihlik.petr@gmail.com >
Upstream-commit: ea0d7b1b3b4d89e7601cb93740fa9ee0e000dd9f
Component: engine
2016-09-03 18:23:43 +02:00
lixiaobing10051267
4e526a616e
modify output info for docker pull centos
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 6becc1a5774e391a3dcade645cdeff46577bf6fa
Component: engine
2016-09-03 22:27:18 +08:00
Tonis Tiigi
833a33ebb8
Fix govet for go1.7
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
2016-09-02 19:07:54 -07:00
Alessandro Boch
f124e10578
Fix mtu option in documentation
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: e74a937b00af567b655c93224cc6a514f54e2b38
Component: engine
2016-09-02 15:39:49 -07:00
Misty Stanley-Jones
7dd0d58809
'docker node inspect <node> --pretty' needs an extra newline at the end
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 341489f1500873a6aa51998f49c1da7f7fd8eb5a
Component: engine
2016-09-02 11:15:00 -07:00
Daniel Nephin
300565157d
Merge pull request #26225 from yongtang/26173-docker-import-quoted-change
...
Fix issue in `docker import -c` with quoted flags
Upstream-commit: 2e0bc0393a7a8f912e0d05d1806c770c1c8c6790
Component: engine
2016-09-02 13:34:25 -04:00
Yanqiang Miao
d354343b40
delete a function which isn't used in the project
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 81849600fc1d7335f1ddc3ca5aa1cb5625bd2d30
Component: engine
2016-09-02 22:54:19 +08:00
Brian Goff
5aa0a2b82e
Merge pull request #26254 from tophj-ibm/change-ppc64le-dockerfile-to-golang
...
ppc64le: change dockerfile base from gcc to golang
Upstream-commit: 75f589a97945a31a5d36b8d348eeeb36e412151d
Component: engine
2016-09-02 10:05:39 -04:00
Antonio Murdaca
4f402c4255
Merge pull request #26264 from q384566678/test-two
...
Modify docker-restart.1.md
Upstream-commit: b98e918248f4d4880b707e24bf2f72878ffbb8d6
Component: engine
2016-09-02 15:53:19 +02:00
Brian Goff
deca0aec9f
Merge pull request #26261 from Microsoft/jjh/morebuildtests
...
Windows CI: Enable some more build tests
Upstream-commit: 84ebbb52314433d4724ad9c75c7d04e886fb59bd
Component: engine
2016-09-02 09:41:08 -04:00
Vincent Demeester
7f24fbc8dc
Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
...
update docs/reference/commandline/service_create.md
Upstream-commit: 1a04d7b1e13ffe725a5310b55e83ae60b1ab7e55
Component: engine
2016-09-02 12:39:31 +02:00
Akihiro Suda
c789417f1c
update docs/reference/commandline/service_create.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: aa479616822e4e6ecd9d90425f11f76cd26ce70d
Component: engine
2016-09-02 09:59:20 +00:00
Akihiro Suda
2f578bc37e
fix the man page and zsh completion for docker images
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: f3d9214d0b42788cfda5104e2a223e968e5a7e82
Component: engine
2016-09-02 09:52:10 +00:00
yuexiao-wang
64ea42838d
Remove the option for the command service rm
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 1016cbb64243ca8adc9444779e6e4717a4541ef7
Component: engine
2016-09-02 17:23:59 +08:00
Justin Cormack
e92f9d7cac
Merge pull request #24510 from runcom/new-seccomp-format
...
New seccomp json format
Upstream-commit: 9d71cba5f09825cdafe04fdb0243cc30bf887b68
Component: engine
2016-09-02 09:14:01 +01:00
zhouhao
6a651a8e95
Modify docker-restart.1.md
...
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com >
Upstream-commit: b99cf0de47420794049f8a208b78fb8be8398f77
Component: engine
2016-09-02 13:06:08 +08:00
yuexiao-wang
96ee703a5f
Remove -h option for docker cli
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 8ad8245ee39d731af7c79e722435c32f051387f7
Component: engine
2016-09-02 11:46:49 +08:00
Yong Tang
e2707394d0
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 >
Upstream-commit: a79a27412d721a042ae96b411ab1b5b926a7d28a
Component: engine
2016-09-01 16:28:22 -07:00
John Howard
9968a690ca
Windows CI: Enable some more build tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ede6163ec684efd04faffa8ce6d7f4213fe08c75
Component: engine
2016-09-01 16:27:04 -07:00
Derek McGowan
d8e519121e
Update token server error test to not fail on retries
...
Instead of having the misconfigured token server test
fail after maxing out retries, only retry a few times
then return an error which will not retry.
Referenced by #19425
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 3f5392fddaa3a25b97f083487b85bf0a158fdd15
Component: engine
2016-09-01 15:18:15 -07:00
Bilal Amarni
9d1a7feea8
Remove systemd drop-in file on raspbian
...
It makes systemd integration less intrusive, notably needed for
docker machine (cf. https://github.com/docker/machine/pull/3605 ).
The default storage driver would now be devicemapper, until the
deb package is updated.
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com >
Upstream-commit: de078211b30e13825b596ff4b2798e0fb780551a
Component: engine
2016-09-01 23:18:05 +02:00
Christopher Jones
949c541343
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 >
Upstream-commit: a243f35cf8906dc6d541dc3dd779a0a2c90cfa12
Component: engine
2016-09-01 16:51:11 -04:00
Luciano Mores
400f4d8a48
Fixed custom daemon options on systemd docs still using -H fd://
...
Signed-off-by: Luciano Mores <leslau@gmail.com >
Upstream-commit: c6fae2d12ff9bd51bce9733cd6636f618b589fb5
Component: engine
2016-09-01 17:38:25 -03:00
Vincent Demeester
9d092e464e
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
Upstream-commit: b14f29dfbd527fd2dbd05e024f760939aba6642c
Component: engine
2016-09-01 20:53:07 +02:00
Vincent Demeester
a7538f7929
Merge pull request #26242 from YuPengZTE/devEG
...
"eg." should be "e.g."
Upstream-commit: baf2108baf8f4ff504847224cfb00794dfea5c20
Component: engine
2016-09-01 20:46:46 +02:00
Vincent Demeester
19ba10b1b0
Merge pull request #26172 from Microsoft/jjh/testinspect
...
Windows: Enable multiple TestInspect tests
Upstream-commit: a19bdec6f0f2ca1b7539f701583f2f33f1923a2c
Component: engine
2016-09-01 19:46:19 +02:00
Tõnis Tiigi
a1893f6374
Merge pull request #26077 from runcom/fix-TestImportBadURL
...
integration-cli: fix TestImportBadURL w/o network
Upstream-commit: 83fc63f9678cd1233bb0f86591a558acada621ac
Component: engine
2016-09-01 09:30:02 -07:00
Vivek Goyal
f9ef0edaad
devmapper: Provide a knob dm.xfs_nospace_max_retries
...
When xfs filesystem is being used on top of thin pool, xfs can get ENOSPC
errors from thin pool when thin pool is full. As of now xfs retries the
IO and keeps on retrying and does not give up. This can result in container
application being stuck for a very long time. In fact I have seen instances
of unkillable processes. So that means once thin pool is full and process
gets stuck, container can't be stopped/killed either and only option left
seems to be power recycle of the box.
In another instance, writer did not block but failed after a while. But
when I tried to exit/stop the container, unmounting xfs hanged and only
thing I could do was power cycle the machine.
Now upstream kernel has committed patches where it allows user space to
customize user space behavior in case of errors. One of the knobs is
max_retries, which specifies how many times an IO should be retried
when ENOSPC is encountered.
This patch sets provides a tunable knob (dm.xfs_nospace_max_retries) so
that user can specify value for max_retries and tune xfs behavior. If
one sets this value to 0, xfs will not retry IO when ENOSPC error is
encountered. It will instead give up and shutdown filesystem.
This knob can be useful if one is running into unkillable
processes/containers issue on top of xfs.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 4f0017b9ad7dfa2e9dcdee69d000b98595893e60
Component: engine
2016-09-01 11:38:09 -04:00
Vincent Demeester
9c1528efb8
Merge pull request #26226 from YuPengZTE/devTest
...
The first letter should be small in errors.New
Upstream-commit: 8abaf62715fab8422f20a28af2ff848223898839
Component: engine
2016-09-01 17:28:32 +02:00
dbdd
7a15c4b5ad
add volumes, networks, nodes and services into label doc
...
Signed-off-by: dbdd <wangtong2712@gmail.com >
Upstream-commit: 30404950c49986291c02e1f9e6f0fce3cb54e09b
Component: engine
2016-09-01 20:25:19 +08:00
Antonio Murdaca
009555a4b2
New seccomp format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5ff21add06ce0e502b41a194077daad311901996
Component: engine
2016-09-01 11:53:07 +02:00
Justin Cormack
a03ebc79ee
Merge pull request #26200 from runcom/engine-api-vendor
...
vendor docker/engine-api@f9cef59044
Upstream-commit: 8ccac1ad4de898583113d036810da3a35a9be906
Component: engine
2016-09-01 10:51:34 +01:00
YuPengZTE
ec1fcdb2ef
eg. should be e.g.
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: e4ac375fdbf331a8474c3b9a33be21a6434d5eb6
Component: engine
2016-09-01 17:44:35 +08:00
YuPengZTE
4fbbab7cfa
The first letter docker is small
...
Upstream-commit: e0e62874bb9bcdaf6418e0d1728c9170527b3c3a
Component: engine
2016-09-01 17:03:01 +08:00
Vincent Demeester
d73fb19f36
Merge pull request #26180 from yongtang/25943-validate-ip6
...
Fix issue in `--ip6` validation for `docker create`
Upstream-commit: f173555de8201d8b4a6578a52d405655212fbb5d
Component: engine
2016-09-01 11:02:16 +02:00
Vincent Demeester
861fb5fa76
Merge pull request #26181 from yongtang/08302016-DockerDaemonSuite-NewDaemon
...
Change related test from DockerSuite to DockerDaemonSuite in `docker_cli_daemon_test.go`
Upstream-commit: b8d510e86ad6a70aad09442b89e0e984b14e0c72
Component: engine
2016-09-01 09:42:59 +02:00
zhouhao
c222d18573
Modify rename function usage
...
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com >
Upstream-commit: 61c8b3380fe35fbd021a3efc1f180c1636d08a27
Component: engine
2016-09-01 14:48:02 +08:00
yuexiao-wang
3528fc09b1
Fix readme doc for dockerd
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 00dcbd0693482a103b0de1ae2d1cd6e9d5c84339
Component: engine
2016-09-01 14:47:51 +08:00
lixiaobing10051267
6be9adf324
check inconsistant command in docs/reference/commandline
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: efe39448f76de4b3eab4feb7235f4f135b987dae
Component: engine
2016-09-01 12:21:52 +08:00
YuPengZTE
c484c505e6
The first letter should be small in errors.New
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: e7935da2390bf458f07e9898f08a332ef9f53255
Component: engine
2016-09-01 11:26:40 +08:00
Brian Goff
be784b745a
Merge pull request #26186 from ywk253100/master
...
Fixes #25654 , a bug in implements of loading image
Upstream-commit: 7776a0ebd76d7d69fb8198554e30a51d94edf056
Component: engine
2016-08-31 22:07:01 -04:00
Tõnis Tiigi
436151d741
Merge pull request #26211 from aaronlehmann/no-advertise-addr-detection-on-join
...
cluster: Do not autodetect advertise address on join
Upstream-commit: beba6ea311fdff128ac2f1de78138c5da71d0f23
Component: engine
2016-08-31 17:19:23 -07:00
Arnaud Porterie
d6cc83cde2
Merge pull request #26208 from talex5/fix-health-test
...
Fix exec form of HEALTHCHECK CMD
Upstream-commit: 5a56f29c64ab1a2bb4f70ba65f248cd8fcebc57f
Component: engine
2016-08-31 23:27:39 +00:00
frosforever
2d42e16cb9
Correct typo in run reference docs that use the create command
...
Signed-off-by: Yosef Fertel <yfertel@gmail.com >
Upstream-commit: 84196adf3d8bf174e269018a3a0b87b5a4afd1ab
Component: engine
2016-08-31 18:09:43 -04:00
Tõnis Tiigi
17a1a5ab1b
Merge pull request #26214 from tonistiigi/revert-daemonsuite-fix
...
Revert "Change related tests from DockerSuite to DockerDaemonSuite in…
Upstream-commit: bdae52a23dd69be29f0d5b871ee791180329e458
Component: engine
2016-08-31 14:16:39 -07:00
Antonio Murdaca
1965814a4e
vendor docker/engine-api@f9cef59044
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 8f7a8c75ae251f1260299892c5de7c83224b110e
Component: engine
2016-08-31 22:39:13 +02:00
Vincent Demeester
5fcc71ddc8
Merge pull request #26206 from crosbymichael/py-xunit
...
Output docker-py test results in xunit format
Upstream-commit: 243d4dcc7e9ea3eb665301d5e3756afa4adb04f7
Component: engine
2016-08-31 21:48:47 +02:00
Vincent Demeester
6366d986f8
Merge pull request #26191 from runcom/fix-unknownflag-exit-code
...
api: client: container: update: fix help text
Upstream-commit: 6ac30e57d0c3060478a04352b19e4188a8d0cc3e
Component: engine
2016-08-31 21:15:51 +02:00
Tibor Vass
9a5643d969
Merge pull request #26058 from anusha-ragunathan/add-pluginstore
...
Reorganize plugin package into sub packages.
Upstream-commit: e3bc989a9d14f2c47eab7874fad2865d0906b9ea
Component: engine
2016-08-31 11:58:34 -07:00