Commit graph

26393 commits

Author SHA1 Message Date
Sebastiaan van Stijn
3892ac7e94
docs: add missing content-type header for image load
Without a content-type header, Go uses a max post size
of 10 megabytes, which makes loading images fail
if they're larger than 10 megabytes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-09 10:56:49 +02:00
unclejack
34877a41a8 Merge pull request #25510 from justincormack/patricia-2.2.5
Update go-patricia to 2.2.5
2016-08-09 01:06:53 -07:00
Justin Cormack
b2b41b2194 Merge pull request #25502 from LK4D4/update_gorilla
vendor: use tags for gorilla projects
2016-08-08 23:28:15 +01:00
Sebastiaan van Stijn
c51f639531 Merge pull request #25506 from sfsmithcha/fix_network_name
fix overlay network example
2016-08-09 00:24:08 +02:00
Justin Cormack
e4402b285b Update go-patricia to 2.2.5
Fixes an issue that showed up on gccgo.

Fix #25360

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-08 22:28:41 +01:00
Charles Smith
0277eb9a32 fix overlay network example
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-08 14:08:10 -07:00
Vincent Demeester
31e3970394 Merge pull request #20848 from WeiZhang555/move-rm-to-daemon
Move --rm to daemon side
2016-08-08 22:11:06 +02:00
Vincent Demeester
b435d75526 Merge pull request #25494 from thaJeztah/fix-bind-mount-validation
fix validation of non-existing bind-mount source
2016-08-08 21:14:25 +02:00
Alexander Morozov
98530ac8e2 vendor: use tags for gorilla projects
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-08-08 11:58:32 -07:00
Vincent Demeester
1c32bed48c Merge pull request #25496 from allencloud/update-go-units-vendor
update go-units vendor to newest version
2016-08-08 20:34:00 +02:00
Vincent Demeester
c52063d8bf Merge pull request #25493 from justincormack/ADD-at-least-two
More helpful error message when not sufficiently argumentative
2016-08-08 20:28:08 +02:00
Zhang Wei
7df815d2af Add docs for auto-removal on daemon
Docs for #20848: move "--rm" to daemon side.

Add description for introduced API changes.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-09 00:47:12 +08:00
Justin Cormack
4ce93940b7 More helpful error message when not sufficiently argumentative
The error message suggests you need one argument even when you
have provided one. Suggest having another argument.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-08 17:22:09 +01:00
allencloud
fc63bb83ca update go-units vendor to newest version
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-09 00:10:19 +08:00
Sebastiaan van Stijn
84d5ab96ef
fix validation of non-existing bind-mount source
Unlike `docker run -v..`, `docker service create --mount`
does not allow bind-mounting non-existing host paths.

This adds validation for the specified `source`, and
produces an error if the path is not found on the
host.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-08 17:24:00 +02:00
Zhang Wei
1537dbe2d6 Not use goroutine for container's auto-removal
Before this, container's auto-removal after exit is done in a goroutine,
this commit will get ContainerRm out of the goroutine.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-08 22:46:53 +08:00
Zhang Wei
6dd8e10d6e Wait container's removal via Events API
If AutoRemove is set, wait until client get `destroy` events, or get
`detach` events that implies container is detached but not stopped.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-08 22:46:53 +08:00
Zhang Wei
3c2886d8a4 Move --rm to daemon side
`--rm` is a client side flag which caused lots of problems:
1. if client lost connection to daemon, including client crash or be
killed, there's no way to clean garbage container.
2. if docker stop a `--rm` container, this container won't be
autoremoved.
3. if docker daemon restart, container is also left over.
4. bug: `docker run --rm busybox fakecmd` will exit without cleanup.

In a word, client side `--rm` flag isn't sufficient for garbage
collection. Move the `--rm` flag to daemon will be more reasonable.

What this commit do is:
1. implement a `--rm` on daemon side, adding one flag `AutoRemove` into
HostConfig.
2. Allow `run --rm -d`, no conflicting `--rm` and `-d` any more,
auto-remove can work on detach mode.
3. `docker restart` a `--rm` container will succeed, the container won't
be autoremoved.

This commit will help a lot for daemon to do garbage collection for
temporary containers.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-08 22:46:53 +08:00
Sebastiaan van Stijn
2684459ed4 Merge pull request #23718 from yongtang/23498-entrypoint-unset
Allow unset `--entrypoint` in `docker run` or `docker create`
2016-08-08 14:38:01 +02:00
Sebastiaan van Stijn
02ca34bc30 Merge pull request #25479 from lixiaobing10051267/masterThey
Fix typo for docker swarm description
2016-08-08 12:05:40 +02:00
Vincent Demeester
842d69d105 Merge pull request #25478 from yuexiao-wang/fixfuncname
Modify func name in integration-cli
2016-08-08 11:03:25 +02:00
lixiaobing10051267
eb4b965ddb Fix typo for docker swarm description
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-08 14:47:15 +08:00
yuexiao-wang
427869fe94 modify func namt from TestUserAgentPassThroughOnPull to TestUserAgentPassThrough
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-08 11:40:20 +08:00
Vincent Demeester
8b69fc4e88 Merge pull request #25462 from DieterReuter/cleanup-manpage-container
Cleanup manpage container in build process
2016-08-06 17:21:10 +02:00
Dieter Reuter
12c10239bb Cleanup manpage container in build process
When running a `make manpages` the image `docker-manpage-dev` will be build and started to create
the man pages. But the container will not be deleted afterwards. So I propose to start it with
`docker run --rm ...`, otherwise we'll collect some trash.
```
$ docker ps -a
CONTAINER ID        IMAGE                COMMAND                  CREATED             STATUS                      PORTS               NAMES
e3d9f721d862        docker-manpage-dev   "man/generate.sh"        19 minutes ago      Exited (0) 16 minutes ago                       berserk_jang
5738a23fb682        docker-manpage-dev   "man/generate.sh"        9 hours ago         Exited (0) 9 hours ago                          boring_bartik
15490b5e63f7        docker-manpage-dev   "man/generate.sh"        10 hours ago        Exited (0) 10 hours ago                         lonely_joliot
```

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2016-08-06 10:20:16 +02:00
Vincent Demeester
59b03240b1 Merge pull request #25457 from sfsmithcha/add_force_remove_to_admin_guide
add force remove to admin guide, clean up usage of Raft, cluster -> s…
2016-08-06 09:16:23 +02:00
Vincent Demeester
8615c8b52d Merge pull request #25455 from abronan/improve_cli_promote_demote_output
swarm: improve cli output on node promote/demote for unchanged role
2016-08-06 09:12:46 +02:00
Vincent Demeester
e62b945013 Merge pull request #25458 from sfsmithcha/fix_swarm_update_typo
fix typo, change sample cert expiry value
2016-08-06 09:10:12 +02:00
Vincent Demeester
5659b1f181 Merge pull request #23725 from yongtang/23528-journald-sanitize
Sanitize docker labels when used as journald field names
2016-08-06 09:04:54 +02:00
Lei Jitang
b72a41b32e Merge pull request #25442 from albers/completion--env
Fix bash completion for `docker service {create,update} {-e,--env}`
2016-08-06 10:47:18 +08:00
Charles Smith
6c38e6877a add force remove to admin guide, clean up usage of Raft, cluster -> swarm, fix some organization
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-05 17:27:10 -07:00
Aaron Lehmann
29dfdeed72 Merge pull request #25454 from dave-tucker/bug/25453
cli: service inspect - Null check for UpdateConfig
2016-08-05 17:20:08 -07:00
Charles Smith
8e53390b51 fix typo, change sample cert expiry value
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-05 16:51:07 -07:00
Yong Tang
26c913cb60 Update documentation for entrypoint unset with docker run/create
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-05 16:35:25 -07:00
Yong Tang
c8d3ee8093 Allow unset --entrypoint in docker run or docker create
This fix tries to address the issue raised in #23498 to allow unset
`--entrypoint` in `docker run` or `docker create`.

This fix checks the flag `--entrypoint` and, in case `--entrypoint=` (`""`)
is passed, unset the Entrypoint during the container run.

Additional integration tests have been created to cover changes in this fix.

This fix fixes #23498.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-05 16:35:20 -07:00
Alexandre Beslic
5479df79c7 swarm: improve cli output on node promote/demote for unchanged role
As of now promoting (or demoting) a node that has its role
left unchanged will always print a successful message.

This PR fixes the issue by matching the behavior on swarmkit's
swarmctl command and printing a message when desired role is
the current role of the node.

As a result this also avoids calling update when it is not
necessary.

Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2016-08-05 15:51:32 -07:00
Yong Tang
9528ea930c Sanitize docker labels when used as journald field names
This fix tries to address the issue raised in #23528 where
docker labels caused journald log error because journald
has special requirements on field names.

This fix addresses this issue by sanitize the labels per
requirements of journald.

Additional unit tests have been added to cover the changes.

This fix fixes #23528.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-05 15:20:47 -07:00
Dave Tucker
0e1fe4516f cli: service inspect - Null check for UpdateConfig
Fixes #25453

Signed-off-by: Dave Tucker <dt@docker.com>
2016-08-05 22:42:14 +01:00
Tõnis Tiigi
6401bd65b1 Merge pull request #25072 from mlaventure/oos-libcontainerd-client
Handle out-of-sync libcontainerd client on restore
2016-08-05 14:23:25 -07:00
Vincent Demeester
049210ce46 Merge pull request #24703 from jhorwit2/jah/#24696
Fixes #24696 - Fixes Size showing 0 in formatted ps output
2016-08-05 21:28:45 +02:00
Daniel Nephin
8a81986a58 Merge pull request #24948 from dnephin/support-iterative-integration-testing
Support running integration tests without restarting a daemon
2016-08-05 14:23:24 -04:00
Vincent Demeester
54e2cbc11e Merge pull request #25447 from albers/completion-swarm-interfaces
Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
2016-08-05 19:59:32 +02:00
Alexander Morozov
6c07fbd455 Merge pull request #25090 from swernli/rootfs-cleanup
Removing old custom RootFS behavior on Windows.
2016-08-05 10:55:44 -07:00
Brian Goff
e9bfb9b4cb Merge pull request #25448 from albers/completion-swarm-join--adveritse-addr
Fix bash completion for `docker swarm join --advertise-addr`
2016-08-05 13:50:26 -04:00
Vincent Demeester
b2b3cb7be9 Merge pull request #22770 from twistlock/22729_dynamic_authz_reload
Enable to dynamically reload authorization plugins via daemon.config
2016-08-05 19:38:40 +02:00
Brian Goff
5605510bb6 Merge pull request #25444 from albers/completion-node-inspect-self
Add `self` to bash completion of `docker node inspect`
2016-08-05 13:21:01 -04:00
Harald Albers
fa1b82e5eb Fix bash completion for docker swarm join --advertise-addr
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 19:14:13 +02:00
Brian Goff
c1e0195857 Merge pull request #25383 from tonistiigi/fix-restart-err
Fix possible race on container restart and restart error handling
2016-08-05 13:12:17 -04:00
Harald Albers
07f6655286 Improve bash completion for docker swarm {init,join} --{advertise,listen}-addr}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 18:56:17 +02:00
Sebastiaan van Stijn
e4bca49356 Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory
update D4M D4W advisory in swarm tutorial
2016-08-05 18:37:35 +02:00