Commit graph

26286 commits

Author SHA1 Message Date
Sebastiaan van Stijn
87e48ecd04 Merge pull request #23497 from shishir-a412ed/dm_task_run_failed
Fixes Issue # 23418: Race condition between device deferred removal and resume device.
2016-08-03 21:54:33 +02:00
Tibor Vass
6ebf816f80 Merge pull request #25373 from thaJeztah/lift-dockerfile-moratoriom
Remove Dockerfile syntax from frozen features
2016-08-03 11:45:17 -07:00
Tibor Vass
5e91023867 Merge pull request #25192 from dnephin/fix-manpages-on-arm
Fix the man/Dockerfile for arm
2016-08-03 10:45:53 -07:00
Sebastiaan van Stijn
29648795cd Merge pull request #24736 from johnharris85/fix-sinatra-tutorial
Fix broken gem instructions.
2016-08-03 19:36:19 +02:00
Brian Goff
f7d48d74a3 Merge pull request #25376 from sfsmithcha/fix_typo
add missing period
2016-08-03 13:31:36 -04:00
Charles Smith
8bdb682205 add missing period
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-03 09:51:09 -07:00
Sebastiaan van Stijn
07250457df
Remove Dockerfile syntax from frozen features
As discussed on the maintainers mailinglist,
and during a maintainers review session;

We've recently made changes to the Dockerfile
syntax (e.g., `HEALTHCHECK`, `SHELL`), so
mentioning the Dockerfile syntax as a frozen
feature is no longer accurate.

Removing it from frozen features does NOT
automatically state an intent to make big
changes to the syntax; making changes
to the syntax are important decisions and
should never be taken lightly.

This change is just to indicate that we
can *accept* changes if they are meaningful,
and we're confident they can be made.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-03 17:17:54 +02:00
Vincent Demeester
4a94a6513b Merge pull request #25341 from tonistiigi/fix-pending-tests
Fix swarm pending state tests
2016-08-03 16:12:43 +02:00
Vincent Demeester
d68253d19f Merge pull request #25329 from lixiaobing10051267/MasterBindVolume
It is volume not binds for first arg in callDecodeContainerConfig()
2016-08-03 16:10:37 +02:00
Sebastiaan van Stijn
0ab06816ea Merge pull request #25194 from vdemeester/23597-swarm-api-ref-fixes
Update `/node/*` api reference documentation
2016-08-03 15:44:18 +02:00
Sebastiaan van Stijn
e737e6a204 Merge pull request #25366 from yongtang/08032016-man-docker-create-user-flag
Update `--user`/`-u` flag in man page of `docker create`
2016-08-03 15:29:25 +02:00
Vincent Demeester
63d65505b2 Update /node/* api reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-03 14:55:30 +02:00
Yong Tang
55478a2c3e Update --user/-u flag in man page of docker create
The `--user`/`-u` of the `docker create` is the same as
`docker run`, which could take either `uid` or `uid:gid`
format. However, the description in the man page of `docker create`
is missing and may cause some confusions (comared with `docker run`).

This fix updates the man page of `docker create` so that it is
consistent with the man page of `docker run`.

This fix is related to 25304.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-03 05:36:07 -07:00
Vincent Demeester
cebdb89998 Merge pull request #23422 from thaJeztah/skip-hidden-files
deb: skip hidden files when generating indexes
2016-08-03 14:31:33 +02:00
Sebastiaan van Stijn
153c946b79 deb: skip hidden files when generating indexes
We don't need hidden files to be listed
in the indexes, so skip them if hidden
files exist.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-03 12:58:14 +02:00
Sebastiaan van Stijn
919257da66 Merge pull request #25359 from albers/completion-node-rm--force
Add bash completion for `docker node rm --force`
2016-08-03 11:22:25 +02:00
Harald Albers
46d3464362 Add bash completion for docker node rm --force
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-03 11:08:28 +02:00
Sebastiaan van Stijn
5c9bcaa942 Merge pull request #25358 from lixiaobing10051267/masterBe
Remove reduntant word in device-mapper-driver.md
2016-08-03 10:21:39 +02:00
lixiaobing10051267
96c959ec6b Remove reduntant word in device-mapper-driver.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-03 16:13:44 +08:00
Sebastiaan van Stijn
cfd2719bf7 Merge pull request #25346 from tonistiigi/mask-join-tokens
Mask join tokens in daemon logs
2016-08-03 01:34:18 +02:00
Sebastiaan van Stijn
6e19e7b1d7 Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update
[Carry 24314] Make MongoDB sample Dockerfile working again
2016-08-03 01:27:26 +02:00
Maxim Fedchyshyn
60f4c7dac3
Make MongoDB sample Dockerfile working again
There were couple issues in the previous version of this Dockerfile

1. [MongoDB manual](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu/) uses 3.2 repo version as of July'16.
2.  Command `# lsb_release -sc`  doesn't work out of box, because of `bash: lsb_release: command not found`.

Signed-off-by: Maxim Fedchyshyn <sevmax@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-03 01:09:31 +02:00
Sebastiaan van Stijn
2cb1281a4a Merge pull request #25349 from thaJeztah/carry-25174-api-docs-update
[carry 25174] 409 status code result to create service
2016-08-03 01:04:36 +02:00
Daniel X Moore
397cc85643
409 status code result to create service
Added example 409 status code result to the create service endpoint.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-03 00:46:04 +02:00
Tonis Tiigi
e3917c76ce Mask join tokens in daemon logs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-02 15:15:23 -07:00
Brian Goff
404705fd8e Merge pull request #25345 from dperny/fix-service-inspect-pretty
Fix missing newline in service inspect --pretty
2016-08-02 17:50:28 -04:00
Sebastiaan van Stijn
10ae908bfa Merge pull request #25159 from diogomonica/adding-force-to-node-remove
Adding force to node rm
2016-08-02 22:49:15 +02:00
Drew Erny
02ebaf364f Fix missing newline in service inspect --pretty
Printing off networks as part of --pretty was missing a newline, causing
the next thing printed to be concatenated onto the end of the line.
Added an empty println after all networks are printed.

Signed-off-by: Drew Erny <drew.erny@docker.com>
2016-08-02 13:27:35 -07:00
Sven Dowideit
181f5ac627 Merge pull request #25282 from clhlc/clhlc-patch-1
Update swarm-mode.md
2016-08-02 13:06:24 -07:00
Sven Dowideit
1d8617a42b Merge pull request #25241 from jhorwit2/jah/ps-doc-fix
Added shutdown to desired-state docs for filter node/service ps
2016-08-02 13:05:47 -07:00
Tonis Tiigi
fa3b5964b9 Fix swarm pending state tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-02 11:39:05 -07:00
Brian Goff
f0d7bd597b Merge pull request #25333 from cpuguy83/25331_fix_missing_mount_id
Fix missing mount ID on volume unmount
2016-08-02 13:10:54 -04:00
Vincent Demeester
3d28cdd2f5 Merge pull request #25308 from thaJeztah/join-token-refactor
Improve swarm join-token instructions
2016-08-02 18:57:37 +02:00
Daniel Nephin
fcde27e6db Fix the man/Dockerfile for arm
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-08-02 12:56:05 -04:00
Alexander Morozov
c73b054ae3 Merge pull request #25300 from duglin/FixEnv
Don't allow empty env names
2016-08-02 09:45:28 -07:00
Vincent Demeester
50c08f0f09 Merge pull request #25330 from yongtang/docs-service-create-update-user
Update docs in `docker service create/update` for flag `--user`
2016-08-02 17:58:39 +02:00
Brian Goff
63983f3ffe Fix missing mount ID on volume unmount
Fixes #25331

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-02 11:24:54 -04:00
Sebastiaan van Stijn
b47df1ddbe Merge pull request #25105 from hqhq/fix_kmem_test
Fix TestUpdateKernelMemoryUninitialized on new kernel version
2016-08-02 17:15:53 +02:00
Sebastiaan van Stijn
ebebd41769
Improve swarm join-token instructions
this change improves the instructions for
swarm join-token and swarm init;

- only print the join-token command for workers
  instead of for both managers and workers, to
  prevent users from copying the wrong command.
  An extra line is added to explain how to obtain
  the manager token.
- print a message that a token was rotated
  sucesfully if '--rotate' is used.
- add some extra white-space before / after
  the join commands, to make copy/pasting
  easier.

this change also does some refactoring of join-token;

- move flagname-constants together with other constants
- use variables for selected role ("worker" / "manager")
  to prevent checking for them multiple times, and to
  keep the "worker" / "manager" sting centralized
- add an extra blank line after "join-token" instructions
  this makes it easier to copy, and cleans up the
  code a tiny bit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-02 16:44:02 +02:00
Shishir Mahajan
0e633ee14a Fixes Issue # 23418: Race condition between device deferred removal and resume device.
Problem Description:

An example scenario that involves deferred removal
1. A new base image gets created (e.g. 'docker load -i'). The base device is activated and
mounted at some point in time during image creation.
2. While image creation is in progress, a privileged container is started
from another image and the host's mount name space is shared with this
container ('docker run --privileged -v /:/host').
3. Image creation completes and the base device gets unmounted. However,
as the privileged container still holds a reference on the base image
mount point, the base device cannot be removed right away. So it gets
flagged for deferred removal.
4. Next, the privileged container terminates and thus its reference to the
base image mount point gets released. The base device (which is flagged
for deferred removal) may now be cleaned up by the device-mapper. This
opens up an opportunity for a race between a 'kworker' thread (executing
the do_deferred_remove() function) and the Docker daemon (executing the
CreateSnapDevice() function).

This PR cancel the deferred removal, if the device is marked for it. And reschedule the
deferred removal later after the device is resumed successfully.

Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-08-02 10:33:58 -04:00
lixiaobing10051267
51ee3dfade It should be volume not binds for first arg in callDecodeContainerConfig()
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-02 22:29:34 +08:00
Yong Tang
80a3755a8f Update docs in docker service create/update for flag --user
In `docker service create/update`, flag `--user` actually supports
`uid:gid` (same as `docker run`). However, this is not reflected
in the help and documentation yet.

This fix updates docs in `docker service create/update` to change
the description to `Username or UID (format: <name|uid>[:<group|gid>])`.

The help message output has also been updated.

This fix is related to 25304.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-02 07:01:16 -07:00
Vincent Demeester
2011320fa9 Merge pull request #25316 from cpuguy83/25310_persit_volume_opts
Fix issue reloading mount options on restart
2016-08-02 15:45:05 +02:00
Sebastiaan van Stijn
d7c9c85e30 Merge pull request #25318 from lixiaobing10051267/masterParentheses
A parenthesis omitted in Seccomp.md
2016-08-02 12:27:19 +02:00
Vincent Demeester
7d4ab5ca85 Merge pull request #25314 from swernli/revert-25066-masterErr
Revert "Add checking err for IsWindowsClient()"
2016-08-02 07:49:41 +02:00
Qiang Huang
59069ba29a Fix kernel memory updating docs
Specify that kernel memory updating limitation only applies
on kernel version older than 4.6.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-02 13:36:58 +08:00
Qiang Huang
da5d66fb70 Fix TestUpdateKernelMemoryUninitialized on new kernel version
Fixes: #25073

Update kernel memory on running containers without initialized
is forbidden only on kernel version older than 4.6.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-02 13:17:20 +08:00
lixiaobing10051267
227cae6680 A parenthesis omitted in Seccomp.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-02 12:24:15 +08:00
Lee Chao
4f1a57a8e1 Update swarm-mode.md
Signed-off-by: lichao <lichao@papayamobile.com>
2016-08-02 11:36:32 +08:00
Brian Goff
c560dd9686 Fix issue reloading mount options on restart
On daemon restart the local volume driver will read options that it
persisted to disk, however it was reading an incorrect path, causing
volume options to be silently ignored after a daemon restart.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-01 23:30:39 -04:00