Commit Graph

26412 Commits

Author SHA1 Message Date
058048cb32 Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs
Add delete and update API documentation
Upstream-commit: 2f167a760904f5cf4f6250a55aa8f735fba74594
Component: engine
2016-08-10 08:01:13 +02:00
b9457de055 Merge pull request #25518 from yuexiao-wang/add-debug-info
add more info for debugging
Upstream-commit: eb28dde01f165849bf372e18200e83042c76f26c
Component: engine
2016-08-09 11:56:09 -07:00
b9dc82dd29 Merge pull request #25415 from avaid96/exitret
added functionality to interrupt the terminal when it is waiting for …
Upstream-commit: 91853e44aeb20e55bcfcad5041c274783fdc06bc
Component: engine
2016-08-09 16:47:54 +02:00
bc307a89de Merge pull request #25461 from coolljt0725/fix_update_mem
Fix update memory without memoryswap
Upstream-commit: 8233e2b54d8c88d9c5845cbd30d54e7d5d8cb852
Component: engine
2016-08-09 16:02:55 +02:00
fe7b1d72f0 Merge pull request #23391 from Microsoft/WindowsSandboxSize
Windows: Added support for storage-opt size
Upstream-commit: 04e021d7511fcfdc0838a0165f70a4772c0e7718
Component: engine
2016-08-09 15:34:39 +02:00
1934f7b605 Merge pull request #25530 from thaJeztah/docs-update-image-load-response
docs: add missing "quiet" parameter for image/load and update response
Upstream-commit: 06e3ea141707bc3a1d31a18c4768ed6bbf3976d4
Component: engine
2016-08-09 15:26:16 +02:00
c2f89488d6 Merge pull request #25532 from thaJeztah/docs-update-node-inspect-output
Update example output for node inspect
Upstream-commit: 80c49d1e5206eabf314069c262f7f643adf021e1
Component: engine
2016-08-09 15:24:43 +02:00
7cd50dad87 Add delete and update API documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: da325c035df5f9d733c130bb57065cad2c9bf7fc
Component: engine
2016-08-09 14:50:46 +02:00
46019ac375 Update example output for node inspect
commit 41d580c7a610d8111dc63353cbd94319ca854627 added
"Joined at" to the output of node inspect,
but I forgot that docs changes are needed.

This change updates the example output
of node inspect in the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dcb052c12bf6e67184d0cb6a69daf39c25666cfe
Component: engine
2016-08-09 13:04:35 +02:00
aae342284e Merge pull request #25512 from diogomonica/add-created-at
Adding Joined at to node inspect --pretty
Upstream-commit: 41d580c7a610d8111dc63353cbd94319ca854627
Component: engine
2016-08-09 12:56:32 +02:00
8f318a17a5 Merge pull request #25515 from WeiZhang555/fix-typo
Fix typo
Upstream-commit: c3fdb701287eca00074e41dbc1bb011513479395
Component: engine
2016-08-09 12:47:34 +02:00
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
62e3be9da8 Merge pull request #25527 from thaJeztah/fix-image-load-api-docs
docs: add missing content-type header for image load
Upstream-commit: 5fd483695f8d5ffa297f40730f21031f629333e7
Component: engine
2016-08-09 11:31:55 +02:00
1a12027160 add more info for debugging
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 5882a9ea171b4cade430da8428beec180d0af952
Component: engine
2016-08-09 17:06:44 +08:00
b5bd5a422a 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>
Upstream-commit: 3892ac7e9418547785c36c91c3fb49a9c876c4b1
Component: engine
2016-08-09 10:56:49 +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
31e42c852b Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: da6609ccdca80c587410b0b13606842412e329bd
Component: engine
2016-08-09 09:42:23 +08:00
8c7b924133 Adding Joined at to node inspect
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
Upstream-commit: d1244abc5ce6382b0ebe034bc604ad0c16d2b628
Component: engine
2016-08-08 16:23:10 -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
938e44920b Merge pull request #25506 from sfsmithcha/fix_network_name
fix overlay network example
Upstream-commit: c51f639531459e57f681f97c7358c04a96785db0
Component: engine
2016-08-09 00:24:08 +02: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
f6949391e8 Merge pull request #25493 from justincormack/ADD-at-least-two
More helpful error message when not sufficiently argumentative
Upstream-commit: c52063d8bf0ff389b048471f7bcf9de7cbd39342
Component: engine
2016-08-08 20:28:08 +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
2dac8a0018 Fix update memory without memoryswap
The memory should always be smaller than memoryswap,
we should error out with message that user know how
to do rather than just an invalid argument error if
user update the memory limit bigger than already set
memory swap.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 92394785fa3e55b19402fc762c030d28b36b6cfc
Component: engine
2016-08-08 18:36:03 +08: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
04f7c4390e Merge pull request #25478 from yuexiao-wang/fixfuncname
Modify func name in integration-cli
Upstream-commit: 842d69d105f27e86137eb54caf014c95e9cb2c9d
Component: engine
2016-08-08 11:03:25 +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
b23d2ba1ff Merge pull request #25462 from DieterReuter/cleanup-manpage-container
Cleanup manpage container in build process
Upstream-commit: 8b69fc4e880c2c087035d652e486ebb385ba0826
Component: engine
2016-08-06 17:21:10 +02: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