beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
26369 commits 14 branches 412 tags 338 MiB
Commit graph

26369 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Alexander Morozov
430a234a5b Merge pull request #24434 from AkihiroSuda/fixMakeInstall 
make install: install runc and containerd
 2016-08-05 09:34:21 -07:00
Charles Smith
bd15725519 update D4M D4W advisory in swarm tutorial 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-05 09:13:39 -07:00
Daniel Nephin
1d945a9743 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>
 2016-08-05 12:07:28 -04:00
Harald Albers
b63a7692d6 Add self to bash completion of docker node inspect 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-08-05 18:06:25 +02:00
Sebastiaan van Stijn
f4575970a7 Merge pull request #25441 from thaJeztah/sync-api-docs 
Sync API docs to older API versions
 2016-08-05 18:05:38 +02:00
Sebastiaan van Stijn
5696c47470 Sync API docs 
This synchronizes formatting changes to older
versions of the API

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-05 17:44:58 +02:00
Sebastiaan van Stijn
66671d4ec2 Merge pull request #25405 from thaJeztah/fix-api-markdown 
Fix Markdown formatting in API docs
 2016-08-05 17:44:15 +02:00
Tõnis Tiigi
4c528ae719 Merge pull request #25402 from lixiaobing10051267/masterChmod 
Fatal info not identical with actual chmod intent
 2016-08-05 08:42:30 -07:00
Harald Albers
197f23da49 Fix bash completion for docker service {create,update} {-e,--env} 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-08-05 17:41:40 +02:00
Vincent Demeester
1ccd9d3137 Merge pull request #23475 from vdemeester/add-format-flag-to-network-and-volume-ls 
Add format flag to network and volume ls
 2016-08-05 15:17:45 +02:00
Vincent Demeester
29fef34139 Merge pull request #25387 from yongtang/25374-ps-filter-order 
Sort output of `docker ps --filter` with order by creation time
 2016-08-05 14:47:10 +02:00
Vincent Demeester
85428a1a53 Merge pull request #25096 from vieux/docker_plugin_remove_force 
Add --force to docker plugin remove
 2016-08-05 14:45:05 +02:00
Sebastiaan van Stijn
0af3ca6933 Merge pull request #25435 from kfr2/fix-run-docs-typo 
Fix typo in run command documentation
 2016-08-05 14:19:22 +02:00
Sebastiaan van Stijn
acbac04c4b Merge pull request #25279 from aboch/auto 
Only consider netlink "device" interfaces in address autodetection on Linux
 2016-08-05 14:13:53 +02:00
Vincent Demeester
f570fbb9ba Merge pull request #25401 from lixiaobing10051267/masterConfig 
Docker api inspect assert HostConfig
 2016-08-05 14:11:29 +02:00
Kevin Richardson
b3913024e2 Fix typo in run command documentation 
Signed-off-by: Kevin Richardson <kevin@kevinrichardson.co>
 2016-08-05 07:35:16 -04:00
Sebastiaan van Stijn
4981916546 Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker 
Remove git conflict markers in docs/reference/commandline/swarm_join.md
 2016-08-05 10:48:19 +02:00
Patrick Böänziger
34278b3301 Remove git conflict markers 
Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com>
 2016-08-05 09:41:45 +02:00
Yong Tang
3f97133546 Sort output of docker ps --filter with order by creation time 
This fix tries to address the issue raised in 25374 where the
output of `docker ps --filter` is in random order and
not deterministic.

This fix sorts the list of containers by creation time so that the
output is deterministic.

An integration test has been added.

This fix fixes 25374.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-04 19:27:50 -07:00
Sebastiaan van Stijn
9513aa3a48 Merge pull request #25425 from thaJeztah/remove-rc-suffix 
Remove "-rc" from documentation
 2016-08-05 02:15:24 +02:00
Sebastiaan van Stijn
4f7b731a26 Remove "-rc" from documentation 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-05 01:38:18 +02:00
Victor Vieux
0016b331da Add --force to docker plugin remove 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-04 15:55:45 -07:00
Sebastiaan van Stijn
4191b786c5 Merge pull request #25421 from avaid96/patch-1 
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
 2016-08-05 00:33:37 +02:00
Avi Vaid
570bad1974 minor nit typo in opensl(openssl) genrsa -out delegation.key 2048 
Signed-off-by: Avi Vaid <avaid1996@gmail.com>
 2016-08-04 15:07:20 -07:00