Commit Graph

24741 Commits

Author SHA1 Message Date
d4747af3dc docs: add missing "quiet" parameter for image/load and update response
Progress reporting during image load was added
in 415dd8688618ac2b3872c6a5b5af3afcef2c3e10, but
the corresponding query-parameter was not documented
in the API docs.

This updates the API docs, and adds a response example
both with quiet enabled and disabled.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d13ed38471decb332e9a0872854a97730d548583
Component: engine
2016-08-09 12:08:33 +02:00
835bbac65d Merge pull request #25510 from justincormack/patricia-2.2.5
Update go-patricia to 2.2.5
Upstream-commit: 34877a41a8a6660a31ff3770566cc1341759b16c
Component: engine
2016-08-09 01:06:53 -07:00
936c3ba707 Merge pull request #25502 from LK4D4/update_gorilla
vendor: use tags for gorilla projects
Upstream-commit: b2b41b2194a95c9f8b878b2a97706032fbf54c38
Component: engine
2016-08-08 23:28:15 +01:00
21ddd17186 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>
Upstream-commit: e4402b285ba0a764ea1cffc1487c92b05b59a0ea
Component: engine
2016-08-08 22:28:41 +01:00
0993849fc3 fix overlay network example
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 0277eb9a32d96e11cbfe3c98229008ad29392a3f
Component: engine
2016-08-08 14:08:10 -07:00
b2d7ec8107 Merge pull request #20848 from WeiZhang555/move-rm-to-daemon
Move --rm to daemon side
Upstream-commit: 31e3970394998547d64e1220bd437a4c9c1061e3
Component: engine
2016-08-08 22:11:06 +02:00
6ce2b2f7e0 Merge pull request #25494 from thaJeztah/fix-bind-mount-validation
fix validation of non-existing bind-mount source
Upstream-commit: b435d75526042ffe51df9d9415e98272ac26a975
Component: engine
2016-08-08 21:14:25 +02:00
fc0f559a6c vendor: use tags for gorilla projects
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 98530ac8e2b0e1003f4d8346c5b1445b281d4f9c
Component: engine
2016-08-08 11:58:32 -07:00
0b3fc8bddf Merge pull request #25496 from allencloud/update-go-units-vendor
update go-units vendor to newest version
Upstream-commit: 1c32bed48c160342871d4f1470dd4d62b4baa9a5
Component: engine
2016-08-08 20:34:00 +02:00
d56ceaaede 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>
Upstream-commit: 7df815d2afe006ece9a3bc5c0642bd7643f40124
Component: engine
2016-08-09 00:47:12 +08:00
15fecb0bf3 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>
Upstream-commit: 4ce93940b7c2a640c94296f20352cf6f052d1028
Component: engine
2016-08-08 17:22:09 +01:00
b5cfc0f922 update go-units vendor to newest version
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: fc63bb83caea1baf4d3818b1c8c59f83e9db6f81
Component: engine
2016-08-09 00:10:19 +08:00
0d2b77587c 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>
Upstream-commit: 84d5ab96ef33355e65f5c31210eb1777db372c52
Component: engine
2016-08-08 17:24:00 +02:00
cc46dbc03c 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>
Upstream-commit: 1537dbe2d617013c94aa42c28744feb07a09fb63
Component: engine
2016-08-08 22:46:53 +08:00
34a323258f 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>
Upstream-commit: 6dd8e10d6ed7a7371c5c1824ad58c4403a7b3bfd
Component: engine
2016-08-08 22:46:53 +08:00
b27f1b6d73 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>
Upstream-commit: 3c2886d8a45d8e79b00ab413d91f1af871b58d0a
Component: engine
2016-08-08 22:46:53 +08:00
63356b5588 Merge pull request #23718 from yongtang/23498-entrypoint-unset
Allow unset `--entrypoint` in `docker run` or `docker create`
Upstream-commit: 2684459ed433125257ffde5e95666ff785f26ec2
Component: engine
2016-08-08 14:38:01 +02:00
91b4797af0 Merge pull request #25479 from lixiaobing10051267/masterThey
Fix typo for docker swarm description
Upstream-commit: 02ca34bc307215fff50a89a13cd9d695bd9bc9d4
Component: engine
2016-08-08 12:05:40 +02:00
8b07fc75ff Fix typo for docker swarm description
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: eb4b965ddbe0c351df45dfd81b32c08c7194d804
Component: engine
2016-08-08 14:47:15 +08:00
3b72d892d5 modify func namt from TestUserAgentPassThroughOnPull to TestUserAgentPassThrough
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 427869fe94c9d32daa29f964bbf4371bf2295748
Component: engine
2016-08-08 11:40:20 +08:00
c733ccf2f5 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>
Upstream-commit: 12c10239bbff1def439193d4681464640446bfbb
Component: engine
2016-08-06 10:20:16 +02:00
a9989e0c56 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…
Upstream-commit: 59b03240b17d5c1fdd18e629e614dc5cffc6c536
Component: engine
2016-08-06 09:16:23 +02:00
f1599dae94 Merge pull request #25455 from abronan/improve_cli_promote_demote_output
swarm: improve cli output on node promote/demote for unchanged role
Upstream-commit: 8615c8b52da0a9dfdd51f1e66f76f09d3db5defa
Component: engine
2016-08-06 09:12:46 +02:00
48383b5b93 Merge pull request #25458 from sfsmithcha/fix_swarm_update_typo
fix typo, change sample cert expiry value
Upstream-commit: e62b9450136595ac73b4fd0de766d072c1a6954a
Component: engine
2016-08-06 09:10:12 +02:00
6d724fc98c Merge pull request #23725 from yongtang/23528-journald-sanitize
Sanitize docker labels when used as journald field names
Upstream-commit: 5659b1f18117db38d6cfbe26b0a587901898968a
Component: engine
2016-08-06 09:04:54 +02:00
8efb4bf7c6 Merge pull request #25442 from albers/completion--env
Fix bash completion for `docker service {create,update} {-e,--env}`
Upstream-commit: b72a41b32e683a9d4cb780e3f937e4959447ece0
Component: engine
2016-08-06 10:47:18 +08:00
7a49d47322 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>
Upstream-commit: 6c38e6877aa4cfddee018a5bdfee6a9bbcbcc646
Component: engine
2016-08-05 17:27:10 -07:00
17d93be307 Merge pull request #25454 from dave-tucker/bug/25453
cli: service inspect - Null check for UpdateConfig
Upstream-commit: 29dfdeed72fad096a3a3e01602f63ef58b719e82
Component: engine
2016-08-05 17:20:08 -07:00
faec4a3727 fix typo, change sample cert expiry value
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 8e53390b5101ae30a13fc40f2c2a52019f8b4906
Component: engine
2016-08-05 16:51:07 -07:00
0c71c314fa Update documentation for entrypoint unset with docker run/create
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 26c913cb6054236e2df5b4a1fcdc5708c4be8f4c
Component: engine
2016-08-05 16:35:25 -07:00
0c94d9d1e8 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>
Upstream-commit: c8d3ee80933d6337382fb4a52d90835e263c1aaf
Component: engine
2016-08-05 16:35:20 -07:00
9d14a49a6b 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>
Upstream-commit: 5479df79c7859d5a09f42c22ddb5fa3e56ceeb7c
Component: engine
2016-08-05 15:51:32 -07:00
c892df89ab 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>
Upstream-commit: 9528ea930cdb90f906230a6d4cab179001255927
Component: engine
2016-08-05 15:20:47 -07:00
24a1ece9dc cli: service inspect - Null check for UpdateConfig
Fixes #25453

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: 0e1fe4516fc7af03259753f6d264e91d11fe4d1a
Component: engine
2016-08-05 22:42:14 +01:00
0c4a3deec0 Merge pull request #25072 from mlaventure/oos-libcontainerd-client
Handle out-of-sync libcontainerd client on restore
Upstream-commit: 6401bd65b11931a27a6d2e1d3b6a9278ed4e8fc7
Component: engine
2016-08-05 14:23:25 -07:00
ed50f67ff9 Merge pull request #24703 from jhorwit2/jah/#24696
Fixes #24696 - Fixes Size showing 0 in formatted ps output
Upstream-commit: 049210ce46f4929257e18e8c33fec6eda5366c10
Component: engine
2016-08-05 21:28:45 +02:00
293fa410c5 Merge pull request #24948 from dnephin/support-iterative-integration-testing
Support running integration tests without restarting a daemon
Upstream-commit: 8a81986a583a9e1a146931373608fbff378d09a2
Component: engine
2016-08-05 14:23:24 -04:00
f00255fe74 Merge pull request #25447 from albers/completion-swarm-interfaces
Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
Upstream-commit: 54e2cbc11e956863413859f492194a3dfcdd5646
Component: engine
2016-08-05 19:59:32 +02:00
32be738fe0 Merge pull request #25090 from swernli/rootfs-cleanup
Removing old custom RootFS behavior on Windows.
Upstream-commit: 6c07fbd455cef4a5bda34ced4f0364639667db4d
Component: engine
2016-08-05 10:55:44 -07:00
25b29d1992 Merge pull request #25448 from albers/completion-swarm-join--adveritse-addr
Fix bash completion for `docker swarm join --advertise-addr`
Upstream-commit: e9bfb9b4cbec2b3e7120a2775b74a7c4e3088397
Component: engine
2016-08-05 13:50:26 -04:00
44fa57fb1b Merge pull request #22770 from twistlock/22729_dynamic_authz_reload
Enable to dynamically reload authorization plugins via daemon.config
Upstream-commit: b2b3cb7be92b97150c9be96c606c0ab0a383d2ec
Component: engine
2016-08-05 19:38:40 +02:00
309dacda0b Merge pull request #25444 from albers/completion-node-inspect-self
Add `self` to bash completion of `docker node inspect`
Upstream-commit: 5605510bb6057b0dcdd5bd57b936f69251488723
Component: engine
2016-08-05 13:21:01 -04:00
1e65234473 Fix bash completion for docker swarm join --advertise-addr
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fa1b82e5ebc0e7dafe500e891c8b8c5fe5d4e1aa
Component: engine
2016-08-05 19:14:13 +02:00
e192b700cb Merge pull request #25383 from tonistiigi/fix-restart-err
Fix possible race on container restart and restart error handling
Upstream-commit: c1e019585773f92b3300070283701811980a64c7
Component: engine
2016-08-05 13:12:17 -04:00
a4f26f26fe Improve bash completion for docker swarm {init,join} --{advertise,listen}-addr}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 07f6655286f5e383dba5063bf0dcf2ee02d5e52f
Component: engine
2016-08-05 18:56:17 +02:00
25e106a620 Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory
update D4M D4W advisory in swarm tutorial
Upstream-commit: e4bca493568c2b67bb45fc488cf7c8a81d55e3d3
Component: engine
2016-08-05 18:37:35 +02:00
8e64c9c8ad Merge pull request #24434 from AkihiroSuda/fixMakeInstall
make install: install runc and containerd
Upstream-commit: 430a234a5b0b664f3f047f83ef0b843ee7ebb3cf
Component: engine
2016-08-05 09:34:21 -07:00
7ad5ac8d06 update D4M D4W advisory in swarm tutorial
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: bd15725519453b13802f1b94f2d61ec04b73d266
Component: engine
2016-08-05 09:13:39 -07:00
aa2e0abc3e Support interactive integration testing.
Interactive integration testing is useful when you're developing new tests, or
making changes to cli code.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1d945a9743748373cd5c5bfface3209d241007d7
Component: engine
2016-08-05 12:07:28 -04:00
fe75792b8d Add self to bash completion of docker node inspect
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b63a7692d6c656cfa1081e36de7be690fd007385
Component: engine
2016-08-05 18:06:25 +02:00