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

26343 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
da325c035d
Add delete and update API documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-09 14:50:46 +02: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
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
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
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
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
Alexander Morozov
979d48bbf5 Merge pull request #23902 from dnephin/inspect-to-cobra 
Convert inspect command to Cobra
 2016-08-04 11:20:43 -07:00
Brian Goff
af51c9704c Merge pull request #25370 from thaJeztah/move-experimental-test 
Move TestInspectNamedMountPoint integrationtest from experimental
 2016-08-04 11:12:46 -04:00
Brian Goff
e1b77bd69a Merge pull request #25399 from ilkka/swarm-tutorial-service-ps-output 
Update `service ps` output format in swarm tutorial to match 1.12.0
 2016-08-04 11:03:33 -04:00
lixiaobing10051267
86c72aa01f Docker api inspect Assert HostConfig 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-04 23:01:16 +08:00
Vincent Demeester
7c8780ea63
Refactor dockerCli *Format to ConfigFile call 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-04 15:00:00 +02:00
Vincent Demeester
a488ad1a09
Add volume --format flag to ls 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-04 14:59:55 +02:00
Vincent Demeester
a8aaafc4a3
Add network --format flag to ls 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-04 14:59:51 +02:00
Vincent Demeester
e4fdbbc00b
Refactor api/client/formatter files 
- Create container.go and image.go for specific context code
- Keep common code in formatter.go and custom.go

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-04 14:59:45 +02:00
lixiaobing10051267
bd0ec7ed55 Fatal info not identical with actual chmod intent 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-04 20:14:15 +08:00
Sebastiaan van Stijn
33bd963cfb
Fix Markdown formatting in API docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-04 14:13:30 +02:00
Ilkka Laukkanen
da56fa2699 Fix service ps output format in swarm tutorial 
These changes update the example output for `docker service ps` in the
swarm tutorial's rolling update and node draining sections to match that
produced by 1.12.0: shutdown tasks are listed and the column order and
naming has changed.

Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io>
 2016-08-04 13:01:22 +03:00
Sebastiaan van Stijn
402cf238bf Merge pull request #25391 from sdurrheimer/zsh-completion-node-rm-force 
Add zsh completion for 'docker node rm --force'
 2016-08-04 10:14:30 +02:00
Vincent Demeester
5de2e6d7b8 Merge pull request #25384 from vieux/fix_wait_plugins 
fix deadlock when more than 1 plugin is installed
 2016-08-04 08:46:57 +02:00
Vincent Demeester
73c597e5f2 Merge pull request #25385 from crosbymichael/test-improvements 
Test improvements to reduce time for long running tests
 2016-08-04 08:44:32 +02:00
Steve Durrheimer
b58ef479a6
Add zsh completion for 'docker node rm --force' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-08-04 08:01:04 +02:00
Tonis Tiigi
9be0fb45c2 libcontainerd: mark container exited after failed restart 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-03 17:44:30 -07:00
Victor Vieux
42360d164b fix deadlock when more than 1 plugin is installed 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-03 16:22:12 -07:00
Tõnis Tiigi
e10f6a2e54 Merge pull request #25309 from cpuguy83/25253_fix_accidental_bind_create 
Validate mount paths on task create
 2016-08-03 15:54:03 -07:00
Tonis Tiigi
495448b290 libcontainerd: wait for restart after state change 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-03 15:28:07 -07:00
Michael Crosby
94b1bb82e1 Decrease sleep to 2 seconds 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-08-03 15:25:27 -07:00
Michael Crosby
cfde8e7855 Change number of pings to 1 
This cuts the test time down from 6s to 2s

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-08-03 13:30:34 -07:00
Michael Crosby
2f3b7f08a0 Make network stats version test concurrent 
This change makes the test run go down from 10s to 2s

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-08-03 13:24:55 -07:00
Michael Crosby
3ffa5f6149 Remove build 60 steps 
This test is already covered in the individual graph driver tests and it
adds 15s to the test run without adding value.  The original idea was to
test max number of layers, this is fulfilled by the graph drivers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-08-03 13:16:01 -07:00