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

1309 commits

Author SHA1 Message Date
Victor Vieux
5506e4b62d Merge pull request #4840 from vbatts/vbatts-load_from_input 
docker load: add --input flag
 2014-03-25 14:37:27 -07:00
Vincent Batts
2517370088 docker load: added example of a multiple tag image 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-03-25 08:30:59 -04:00
Sven Dowideit
d9c1116303 Merge pull request #4845 from noducks/link_fix 
Force flag to prevent file already exists error.
 2014-03-25 21:03:04 +10:00
noducks
8e434c314e Force flag to prevent file already exists error. 
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com> (github: noducks)
 2014-03-25 10:26:45 +00:00
Sven Dowideit
30d25a3d27 Merge pull request #4814 from noducks/master 
Reminder for OSX users not to use SUDO
 2014-03-25 20:15:39 +10:00
noducks
69087f2d23 Reminder for OSX users not to use SUDO 
Useful for those who haven't made it to the examples page yet. dad4a998dc

Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com> (github: noducks)
 2014-03-25 09:42:59 +00:00
Vincent Batts
c6c7c03cdd docker load: doc clarification 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-03-24 23:36:07 -04:00
Sven Dowideit
267ca39921 Merge pull request #4839 from bflad/chef-docker-docs 
Add Chef usage documentation
 2014-03-25 12:38:45 +10:00
Brian Flad
c84ff187c6 Fix typo in Using Chef documentation description 
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com> (github: bflad)
 2014-03-24 22:29:54 -04:00
Vincent Batts
84e1fdf35d docker load: add --input flag 
for those that do not care to read from redirected stdin

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-03-24 21:43:26 -04:00
Brian Flad
bb034c6b42 Add Chef usage documentation 
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com> (github: bflad)
 2014-03-24 21:39:15 -04:00
Sven Dowideit
0b2b5a594b Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm 
add a note that --lxc-conf is lxc-driver only.
 2014-03-25 11:21:06 +10:00
Michael Crosby
a258d048a2 Merge pull request #4778 from vbatts/vbatts-save_to_output 
`docker save --output` flags
 2014-03-24 16:52:08 -07:00
Michael Crosby
d503714285 Revert "Disable automatic killing of containers when docker stop fails" 
This reverts commit 8b5cf51d60.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 12:03:56 +00:00
alambike
79c11b19ec Added Eixo::Docker to the list of libraries 
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com> (github: alambike)
 2014-03-21 03:13:06 +01:00
Brian Goff
fbd6fee4ab Fix double single dash arg issues in docs 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-03-20 14:14:54 -04:00
Sven Dowideit
a8cc6ebb18 I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-03-20 09:59:54 +10:00
James Turnbull
f2b01f5fa1 Merge pull request #4784 from SvenDowideit/reference-security-doc 
add a link to the security documentation when we mention the docker group (or -G)
 2014-03-19 17:20:44 -06:00
Sven Dowideit
f3765f96cf add a link to the security documentation when we mention the docker group (or -G) 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-03-20 09:08:52 +10:00
Victor Vieux
aa63ece2ec Merge branch 'master' into discordianfish-https_client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-19 22:05:36 +00:00
Victor Vieux
12687b7c10 Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-19 22:03:11 +00:00
Sven Dowideit
16ee4958f2 Merge pull request #4703 from netroy/patch-1 
Document the missing `DisableNetwork` config flag to /containers/create end-point
 2014-03-20 07:55:35 +10:00
Guillaume J. Charmes
3c9ae2b348 Merge pull request #3774 from danielnorberg/dns-search-domains 
configurable dns search domains
 2014-03-19 14:52:49 -07:00
Daniel Norberg
698ca9f38d fix typo in documentation 
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
 2014-03-19 16:44:09 -04:00
Vincent Batts
e93a16ab48 docker save: add and improve docs 
add usage examples for `docker save ...`

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-03-19 14:47:20 -04:00
Aditya
ec3257921d Docker-DCO-1.1-Signed-off-by: Aditya <aditya@netroy.in> (github: netroy) 
document `DisableNetwork` config flag
 2014-03-19 19:01:49 +01:00
Michael Crosby
47470d299d Merge pull request #4691 from tianon/relative-workdir 
Add proper support for relative WORKDIR instructions
 2014-03-19 09:57:23 -07:00
Daniel Norberg
fbfac21ed4 configurable dns search domains 
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
 2014-03-19 10:49:25 -04:00
James Turnbull
d3c5891486 Merge pull request #4754 from vojnovski/consistent_apt-key_use 
refactor($hack,$docs): be consistent in apt-key keyserver URI usage
 2014-03-19 07:38:05 -06:00
Viktor Vojnovski
4fd82db4be refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740 
In #4740, the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.

Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com> (github: vojnovski)
 2014-03-19 10:20:10 +01:00
James Turnbull
ccddb33bf4 Merge pull request #4727 from andreaturli/master 
add softlayer installation instructions
 2014-03-19 01:04:44 -06:00
Sven Dowideit
9bbc11b2ae Merge pull request #4758 from crosbymichael/redis-bind 
Be explicit about binding to all interfaces in redis example
 2014-03-19 13:04:02 +10:00
Michael Crosby
7822b053cb Be explicit about binding to all interfaces in redis example 
Fixes #4021

Moved to debian because the redis installed in ubuntu is really old
and does not support args via the cli.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-18 17:24:06 -07:00
Michael Crosby
38a3fc3e0e Add sudo clause if your using osx or tcp 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-18 17:07:45 -07:00
Sven Dowideit
9e1306f78f Merge pull request #4755 from crosbymichael/add-size-to-history-docs 
Add image size to history docs
 2014-03-19 09:32:35 +10:00
Michael Crosby
041ae08a2c Add image size to history docs 
Fixes #3147
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-18 16:24:45 -07:00
Michael Crosby
22c18de7be Merge pull request #4744 from LK4D4/fix_issue_#3565 
Using names in docker ps --since-id/--before-id, resolves #3565
 2014-03-18 15:39:56 -07:00
Sven Dowideit
06d87fd540 Merge pull request #4740 from vojnovski/patch-1 
Update ubuntulinux.rst
 2014-03-19 06:48:57 +10:00
LK4D4
c1f2abd899 Using names in docker ps --since-id/--before-id, resolves #3565 
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-03-18 23:30:21 +04:00
Guillaume J. Charmes
bfbf338f51 Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop 
Disable automatic killing of containers when docker stop fails
 2014-03-18 11:28:42 -07:00
Viktor Vojnovski
ae1dd52b19 Update ubuntulinux.rst 
Adding the Docker repository key fails if port 11371 not open. This would probably work for more people.
 2014-03-18 17:10:22 +01:00
Sven Dowideit
e5cbb5c906 add env hint 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-03-18 22:29:11 +10:00
Tianon Gravi
69299f041f Add some documentation about relative WORKDIR values 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-17 19:42:27 -06:00
Guillaume J. Charmes
68dc189680 Merge pull request #4661 from vieux/add_no_prune 
Add no prune
 2014-03-17 16:07:55 -07:00
Andrea Turli
8b159fca8a address comments from @jamtur01 
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: andreaturli)
 2014-03-17 23:39:35 +01:00
Andrea Turli
782eb5f03a add softlayer installation instructions 
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: andreaturli)
 2014-03-17 23:19:47 +01:00
Sven Dowideit
865310e99d Merge pull request #4689 from ralphbean/patch-1 
Update fedora.rst
 2014-03-18 07:49:48 +10:00
Brian Goff
8b5cf51d60 Disable automatic killing of containers when docker stop fails 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-03-17 15:15:44 -04:00
Victor Vieux
a18d08177c Add missing client doc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-17 18:40:57 +00:00
Victor Vieux
afcaaffd0b update doc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-17 18:40:57 +00:00