Граф коммитов

27194 Коммитов

Автор SHA1 Сообщение Дата
Vincent Demeester 1325cde252 Merge pull request #26313 from yongtang/26312-network-ls-help-output-volume
Fix incorrect help output in `docker network ls`
2016-09-05 19:13:09 +02:00
Vincent Demeester d7594d23c8 Merge pull request #26320 from yongtang/09052016-man-docker-create
Update man page for `docker create` to add `--rm` flag
2016-09-05 18:40:07 +02:00
Yong Tang 6ac8224207 Update man page for `docker create` to add `--rm` flag
The `--rm` flag has been part of the `docker create` and
related docs in `docs/reference/commandline/create.md`
already includes the `--rm` flag. However, man page
`man/docker-create.1.md` has not adds the `--rm` flag yet.

This fix adds the description of `--rm` flag to
`man/docker-create.1.md`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-05 08:38:32 -07:00
Yong Tang b9e46235fa Fix incorrect help output in `docker network ls`
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-05 08:24:22 -07:00
Vincent Demeester 175188d8b0 Merge pull request #26292 from lixiaobing10051267/masterDockerPull
modify output info for docker pull centos
2016-09-05 15:44:01 +02:00
Sven Dowideit 8f424f7774 Merge pull request #26314 from unclejack/docs_contiv_nfs
docs: mention NFS support for Contiv volume plugin
2016-09-05 21:51:42 +10:00
unclejack 9fbe0f2156 Merge pull request #26199 from bamarni/raspbian-overlay
remove systemd drop-in unit on raspbian
2016-09-05 04:45:47 -07:00
Vincent Demeester 1145c9b0d5 Merge pull request #26233 from yuexiao-wang/fix-readme
Fix readme doc for dockerd
2016-09-05 13:39:19 +02:00
Antonis Kalipetis c6bff578b4
Add test for checking created directories on remapped root
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2016-09-05 13:02:13 +03:00
Antonis Kalipetis 72d8a77d52
Make host directory mounts use idtools.MkdirAllNewAs
This makes sure that:
1. Already existing directories are left untouched
2. Newly created directories are chowned to the correct root UID/GID in case of user namespaces
3. All parent directories still get created with host root UID/GID

Fix #21738

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2016-09-05 12:46:57 +03:00
unclejack faaccf26e3 docs: mention NFS support for contiv volume plugin
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-09-05 12:38:50 +03:00
Vincent Demeester 01fe5639bc Merge pull request #26236 from yuexiao-wang/remove-h-option
Remove -h option for docker cli
2016-09-05 09:52:18 +02:00
Qiang Huang cec0e2dfbd Cleanup pullSchema2
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-09-05 15:02:14 +08:00
Akihiro Suda d6007b4db0 fix docs about `sudo docker login`
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-05 04:44:18 +00:00
Madhu Venugopal 506c51e71e Merge pull request #26297 from yongtang/26220-disconnect-container-from-network
Fix issue in disconnecting a container from network
2016-09-04 21:15:39 -07:00
Sven Dowideit b468df9eac Merge pull request #26302 from vdemeester/health_status-in-event-docs
Add health status as action on events documentations
2016-09-05 10:03:14 +10:00
Sven Dowideit 384de833c0 Merge pull request #26245 from dbdd4us/master
add volumes, networks, nodes and services into label doc
2016-09-05 10:02:35 +10:00
Matt Richardson bc8eabce25 Allow windows environment variables to contain `=`
Fix issue where environment variables with embedded equals signs were
being dropped and not passed to the container.

Fixes #26178.

Signed-off-by: Matt Richardson <matt.richardson@octopus.com>
2016-09-05 08:49:07 +10:00
Vincent Demeester fb8b6438f2
Add health status as action on events documentations
This was missing from the docs for 1.12.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-09-04 18:01:57 +02:00
Yong Tang 83d79f13aa Fix issue in disconnecting a container from network
This fix tries to address the issue raised in 26220 where
disconnecting a container from network does not work if
the network id (instead of network name) has been specified.

The issue was that internally when trying to disconnecting
a contaienr fromt the network, the originally passed network
name or id has been used.

This fix uses the resolved network name (e.g., `bridge`).

An integration test has been added to cover the changes.

This fix fixes 26220.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-04 07:28:45 -07:00
Harald Albers be455538aa Add bash completion for `service {create,update} --group-{add,rm}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-04 05:52:50 -07:00
lixiaobing10051267 2626d341e7 fix the wrong info while specifying the command with the "--help"
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-09-04 04:26:56 +08:00
Brian Goff 93a8b5c42b Merge pull request #26279 from miaoyq/delete-a-useless-funtion
delete a function which isn't used in the project
2016-09-03 13:36:37 -04:00
Vincent Demeester c73fae2352 Merge pull request #26290 from tonistiigi/govet17
Fix govet for go1.7
2016-09-03 19:27:19 +02:00
Petr Švihlík ea0d7b1b3b Updated Windows mounting example
Signed-off-by: Petr Švihlík <svihlik.petr@gmail.com>
2016-09-03 18:23:43 +02:00
lixiaobing10051267 6becc1a577 modify output info for docker pull centos
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-09-03 22:27:18 +08: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
Misty Stanley-Jones 341489f150 'docker node inspect <node> --pretty' needs an extra newline at the end
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-02 11:15:00 -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
Yanqiang Miao 81849600fc delete a function which isn't used in the project
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-09-02 22:54:19 +08: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
yuexiao-wang 1016cbb642 Remove the option for the command service rm
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-02 17:23:59 +08: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
yuexiao-wang 8ad8245ee3 Remove -h option for docker cli
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-02 11:46:49 +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
Bilal Amarni de078211b3 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>
2016-09-01 23:18:05 +02: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
Luciano Mores c6fae2d12f Fixed custom daemon options on systemd docs still using -H fd://
Signed-off-by: Luciano Mores <leslau@gmail.com>
2016-09-01 17:38:25 -03: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
Vivek Goyal 4f0017b9ad 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>
2016-09-01 11:38:09 -04: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