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

9500 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tianon Gravi
47de2e3269 Merge pull request #6755 from tianon/bash-completion-for-link-and-bind 
Update bash completion for "docker run --link" and "docker run -v" to complete on running containers and the local filesystem respectively
 2014-07-15 00:15:13 -06:00
Solomon Hykes
781a47e3f3 Merge pull request #6885 from tianon/standard-curl-sSL 2014-07-14 18:39:31 -07:00
Fred Lifton
9d6f295d5d Merge pull request #6994 from Aigeruth/fix/docs/registry_api 
Fix MarkDown in Docker Registry API docs
 2014-07-14 15:15:29 -07:00
Michael Crosby
12d58a2688 Merge pull request #7019 from crosbymichael/update-libcontainer-july2 
Update libcontainer to version fb67bb80b4205bece36ff7096ee7
 2014-07-14 14:51:00 -07:00
Tianon Gravi
f77cde6a93 Merge pull request #7018 from tianon/dash 
Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support
 2014-07-14 14:05:04 -06:00
Michael Crosby
f00e643576 Update native driver for libcontainer changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-07-14 12:49:50 -07:00
Michael Crosby
3b4a1c54d8 Update libcontainer dep to fb67bb80b4205bece36ff70 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-07-14 12:30:19 -07:00
Tianon Gravi
4f0fbb885e Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-14 12:34:04 -06:00
Michael Crosby
7ebd49c49a Merge pull request #6968 from vieux/cap_add_drop 
Add support for --cap-add and --cap-drop
 2014-07-14 10:42:29 -07:00
Michael Crosby
b39fb160c6 Merge pull request #6970 from vieux/add_FSETID 
add FSETID back to the caps whitelist
 2014-07-14 10:37:04 -07:00
Tibor Vass
dfbb291c40 Merge pull request #7016 from LK4D4/fix_some_cleanups_in_archive 
Some resource clean ups in archive
 2014-07-14 13:26:47 -04:00
Victor Vieux
804f028862 Merge pull request #7014 from proppy/patch-6 
api/server/MAINTAINERS: comment proppy (vacation)
 2014-07-14 10:15:53 -07:00
Johan Euphrosine
32740543da api/server/MAINTAINERS: comment proppy (vacation) 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-07-14 10:13:46 -07:00
LK4D4
66ccd55ed4 Some resource clean ups in archive 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-14 21:11:48 +04:00
Solomon Hykes
8a4f1ad837 Merge pull request #7012 from shykes/tibor-maintainer 
Add Tibor Vass as maintainer
 2014-07-14 09:25:05 -07:00
Sven Dowideit
b93787e6e0 Merge pull request #6967 from fredlf/copyedit-builds 
Added bitbucket hook info and warning re: validating accounts.
 2014-07-14 03:35:37 +00:00
Gabor Nagy
b1677f9d09 Fix MarkDown in Docker Registry API docs 
Docker-DCO-1.1-Signed-off-by: Gabor Nagy <mail@aigeruth.hu> (github: Aigeruth)
 2014-07-13 11:15:52 +02:00
James Turnbull
e20a95f24c Merge pull request #6989 from jamtur01/builder 
General cleanup of the builder.md file
 2014-07-12 22:22:55 -04:00
James Turnbull
07d93c6e34 General cleanup of the builder.md file 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-07-12 11:30:51 -04:00
James Turnbull
b5a69da5b6 Merge pull request #6990 from folieadrien/missing-rm-api-docs 
add missing api docs for #6863
 2014-07-12 11:21:54 -04:00
James Turnbull
214ab777f4 Merge pull request #6988 from jamtur01/entry 
Rewrote the ENTRYPOINT section in builder
 2014-07-12 11:21:36 -04:00
Adrien Folie
88326e9b91 add missing docs for rm 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-12 06:33:43 +02:00
James Turnbull
b2ba1a9ce5 Rewrote the ENTRYPOINT section in builder 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-07-11 22:12:59 -04:00
Victor Vieux
6bb27f18d1 update api doc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-12 01:03:12 +00:00
Victor Vieux
e7d9854414 add doc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux
c04230c42b add check for invalid caps 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux
064b5f870d support add and drop in both order 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux
222a6f4401 add basic support for 'all' 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux
f3ff323fb3 small refactoring 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux
8344b6d736 fix job and add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux
21059af3ac Basic --cap-add and --cap-drop support for lxc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux
94e6dc9781 Basic --cap-add and --cap-drop support for native 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux
319f551614 Merge pull request #6987 from vieux/fix_6863 
Stop & Kill options for containers removal
 2014-07-11 16:22:01 -07:00
Victor Vieux
fe5ab5b058 proper rebase 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:27:23 +00:00
Adrien Folie
5ba11e6890 update CLI & api docs 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-11 23:26:08 +00:00
Adrien Folie
d689a5e1e2 Add tests for rm with stop and kill options 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-11 23:26:08 +00:00
Adrien Folie
7810070630 Stop/Kill options for containers removal 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-11 23:26:08 +00:00
unclejack
d53db040c8 Merge pull request #6896 from vieux/add_parsing_deamon_side 
Add repo/tag parsing on the daemon for pull and import
 2014-07-12 01:44:32 +03:00
Victor Vieux
00c1668011 Merge pull request #6985 from vieux/fix_api_1.14 
bump api to 1.14 & update docs
 2014-07-11 15:35:25 -07:00
Victor Vieux
cdfdbe9bc6 proper rebase 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 22:39:43 +00:00
Michael Crosby
c3f247860a Merge pull request #6979 from LK4D4/fix_race_inspect_start 
Use container.Lock in public ToDisk method
 2014-07-11 13:44:01 -07:00
LK4D4
eae5cf1e20 Use container.Lock in public ToDisk method 
Here was possible race with inspect where we changing HostConfig.Links
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-11 23:31:03 +04:00
Fred Lifton
358758e99f Edits based on feedback from docs team. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-07-11 11:42:29 -07:00
James Turnbull
2944d8ca3e Merge pull request #6890 from huslage/tls-doc-fixes2 
Clarification of TLS Docs
 2014-07-11 14:36:24 -04:00
Aaron Huslage
c3d91263a8 Clarified TLS Docs 
Made a "Secure by default" section, create 2048-bit keys, various cleanups.

Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
 2014-07-11 14:35:01 -04:00
Solomon Hykes
1a99f36580 Add Tibor Vass as maintainer 
* hack/
* archive/
* integration/
* server/buildfile.go

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-07-11 12:28:11 +00:00
James Turnbull
7c4f7780a1 Merge pull request #6209 from zdover23/03_Jun_2014 
BZ#1104401 - correcting flags in docker-commit
 2014-07-11 08:03:36 -04:00
Victor Vieux
9216ced003 Merge pull request #6961 from crosbymichael/devices-flag 
Add --device flag to allow additional host devices in container
 2014-07-10 17:44:44 -07:00
Victor Vieux
e8762bfe39 add FSETID back to the caps whitelist 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 00:30:56 +00:00
Fred Lifton
e80d075633 Added bitbucket hook info and warning re: validating accounts. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-07-10 16:51:16 -07:00