clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,622 Commits 9 Branches 112 Tags
324010ad66f4fa393f53cbfa2fa68d21dabb5941
Commit Graph
9622 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Kyle c0471ee35a Closes 6937. Allows setting of docker config dir. 
Can now dynamically set the docker config directory through an
environment variable.

export DOCKER_CONFIG=/path/to/docker_config/

Default behavior remains the same, e.g. ~/.docker

Documentation for change added to the https.md docs.

Docker-DCO-1.1-Signed-off-by: James A. Kyle <james@jameskyle.org> (github: jameskyle)
 2014-07-15 15:47:00 -07:00
Fred Lifton 9c8b59c1b0 Merge pull request #6892 from mpapo/docs-docker-aufs-limitation 
Add small note about AUFS layer limitation
 2014-07-15 15:03:46 -07:00
Sven Dowideit 5bdf2cf459 Merge pull request #7037 from henning/patch-3 
Adjust Link description to match target
 2014-07-15 21:55:06 +00:00
Sven Dowideit b6e1cfc075 Merge pull request #6855 from SvenDowideit/update-osx-installer-image-to-show-final-page 
The installer completed page now contains information on next steps, so ...
 2014-07-15 21:17:29 +00:00
James Turnbull 4fc8edd0df Removed legacy api.md file 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-07-15 16:40:43 -04:00
Henning Sprang fb51a330bb Adjust Link description to match target 
The target document headline is "Managing data in containers" and so should the link be named.
 2014-07-15 22:24:08 +02:00
Michaël Pailloncy 2a230729da Update small note about layer limitation 
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com> (github: mpapo)
 2014-07-15 21:58:01 +02:00
Michaël Pailloncy d91d381856 Add small note about AUFS layer limitation 
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com> (github: mpapo)
 2014-07-15 21:58:01 +02:00
James Turnbull 37309f37fa Merge pull request #7029 from albers/patch-2 
no need to create a link to the docker binary
 2014-07-15 13:47:39 -04:00
Harald Albers 88c6017644 no need to create a link to the docker binary 2014-07-15 14:18:28 +02:00
Albert Zhang b3b6e05f26 since moved the ./dockerinit mount into lxc driver, fix the lxc testcase accordingly 
Docker-DCO-1.1-Signed-off-by: Albert Zhang <zhgwenming@gmail.com> (github: zhgwenming)
 2014-07-15 07:56:19 -04:00
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
Sven Dowideit f976014410 The installer completed page now contains information on next steps, so is more useful than the intro 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-07-15 13:50:12 +10:00
Solomon Hykes 781a47e3f3 Merge pull request #6885 from tianon/standard-curl-sSL 2014-07-14 18:39:31 -07:00
Lokesh Mandvekar 0bde827c3f systemd unitfile requires docker.socket 
modified:   contrib/init/systemd/docker.service

Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (github: lsm5)
 2014-07-14 18:08:38 -05:00
Lokesh Mandvekar 076ac1d7d2 use systemd socket-activation by default 
modified:   contrib/init/systemd/docker.service
	renamed:    contrib/init/systemd/socket-activation/docker.socket -> contrib/init/systemd/docker.socket
	deleted:    contrib/init/systemd/socket-activation/docker.service

Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (github: lsm5)
 2014-07-14 17:41:07 -05:00
Lokesh Mandvekar 5105981431 add systemd MAINTAINERS file 
new file:   contrib/init/systemd/MAINTAINERS

Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (github: lsm5)
 2014-07-14 17:38:23 -05: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
Alexandr Morozov 97a3807901 Set state running before dumping to disk 
Fixes #4766
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-14 21:16:27 +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
Vincent Batts 848e837698 docker daemon: initialize the daemon pidfile early 
fixes https://github.com/dotcloud/docker/issues/6973

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-07-12 08:25:05 -04:00
Ian Babrou 1a1ee73e38 Skipping empty lines in .dockerignore 
Docker-DCO-1.1-Signed-off-by: Ian Babrou <ibobrik@gmail.com> (github: bobrik)
 2014-07-12 13:38:33 +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