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

75 commits

Author SHA1 Message Date
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
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
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
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
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
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
Guillaume J. Charmes
f9bd6c860d Merge pull request #4364 from vieux/move_clone 
move git clone from daemon to client
 2014-03-17 11:36:56 -07:00
Tianon Gravi
f6efcf2094 Fix sphinx header underline warnings I introduced... 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-13 22:35:09 -06:00
Tianon Gravi
44fe8cbbd1 Update to double-dash everywhere 
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-13 11:46:02 -06:00
Ken ICHIKAWA
841fcad0ba Add missing options -t and -v to images subcommand doc 
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
 2014-03-13 15:19:42 +09:00
Ken ICHIKAWA
471aa870f5 Remove duplicated description of --mtu 
commit baa70e9751 duplicates
the description of --mtu.
This patch removes the duplicated description.

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
 2014-03-13 14:18:13 +09:00
Guillaume J. Charmes
db1afee3f0 Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit 
merge existing config when committing
 2014-03-12 17:49:11 -07:00
Ken ICHIKAWA
b7ae9984fb Update daemon docs and help messages for --iptables and --ip-forward 
Fix docs and help messages of --iptables and --ip-forward to describe the true case behaviour

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
 2014-03-12 13:50:03 +09:00
Sven Dowideit
bf009b530e Merge pull request #4541 from scollier/master 
Adding the new options to the `docker ps` documentation.
 2014-03-12 11:36:12 +10:00
Scott Collier
fbf74eb079 Removing HEAD tag from last commit 
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
 2014-03-11 20:00:16 -05:00
Scott Collier
7178b285a3 Adding CLI options to the commandline reference documentation. 
Fixing bad DCO sig

URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
 2014-03-11 19:54:48 -05:00
Scott Collier
baa70e9751 Adding the new options to the docker ps documentation. 
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding the new options to the `docker ps` documentation.

URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding CLI options to the commandline reference documentation.

URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

changing indention

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
 2014-03-11 19:51:30 -05:00
Victor Vieux
8301fc8e56 move git clone from daemon to client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)

add a little doc
 2014-03-11 01:23:14 +00:00
Scott Collier
694c8e7dfc Adding options to docker restart documentation 
URL of page is: http://docs.docker.io/en/latest/reference/commandline/cli/#restart

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
 2014-03-08 17:23:06 -06:00
Johannes 'fish' Ziemke
c000cb6471 Add authenticated TLS support for API 
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
 2014-03-09 00:06:44 +01:00
Scott Collier
59acb8c83d Adding the new options to the docker ps documentation. 
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
 2014-03-08 16:32:00 -06:00
Tom Fotherby
d61938d2b8 Correct Docker run --host param to --hostname 2014-03-07 16:41:11 +00:00
unclejack
e388b6aba5 Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command 
Add ability to force removal of running container via docker rm -f
 2014-03-07 00:05:57 +02:00
Evan Krall
644acec2f7 Create a -G option that specifies the group which unix sockets belong to. 
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
 2014-03-06 11:17:04 -08:00
James Turnbull
41bf38e44d Consistently capitalize CLI options 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-03-04 20:22:51 -05:00
James Turnbull
20ddd34d05 Merge pull request #4438 from crosbymichael/update-docs 
Update daemon docs for exec drivers
 2014-03-04 07:56:30 -05:00
Michael Crosby
0f96a749ab Update daemon docs for exec drivers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-03 17:43:08 -08:00
unclejack
611acf7a7c handle symlinks for Docker's root dir & TMPDIR 
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.

It also enables handling symlinks for TMPDIR.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-03 23:00:53 +02:00
Victor Vieux
37d0ce42c6 Merge pull request #4385 from khia/json_format 
Support json output in --format flag of docker inspect
 2014-03-03 12:36:47 -08:00
unclejack
7531f82c70 Merge pull request #4321 from vieux/docker_run_-it 
Add support for docker run -it or docker images -qa
 2014-03-03 20:52:10 +02:00
ILYA Khlopotov
e07920f680 Support json output in --format flag of docker inspect 
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com> (github: khia)
 2014-02-28 17:34:31 -08:00
Wes Morgan
3b969aad4a merge existing config when committing 
Fixes #1141

Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com> (github: cap10morgan)
 2014-02-28 15:27:05 -07:00
Sven Dowideit
b16f466354 one ponted out by lukaspustina, and one that I bet I added 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-03-01 05:12:21 +10:00
Brian Goff
d78fcb32ff Add ability to force removal of running container via docker rm -f 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-02-27 23:31:36 -05:00
Sven Dowideit
cdec3297f7 add a little bit mentioning commandline option combinations 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-02-28 08:14:22 +10:00
unclejack
bde192bb80 Merge pull request #4078 from vieux/rewrite_rmi 
Rewrite docker rmi
 2014-02-26 21:30:24 +02:00
unclejack
31ddc16692 Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build 
make docker build -rm=true default
 2014-02-26 19:03:59 +02:00
Brian Goff
0b4aeb79d9 make docker build -rm=true default #4292 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-02-26 11:04:06 -05:00
Victor Vieux
10faefac3b add missing doc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:08 +00:00
Michael Crosby
c9addff444 Merge pull request #4189 from vbatts/vbatts-execdriver_flag 
execdriver flag for docker daemon
 2014-02-24 23:28:17 -05:00
Danny Berger
afb565e97c Drop -mtu from docs in favor of --mtu only 
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
 2014-02-21 13:43:50 -05:00
Danny Berger
8c4160fe61 Fix cli argument usage typo for docker --mtu 
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
 2014-02-21 10:51:51 -05:00
Sven Dowideit
e59485e148 reinforce that docker build --rm is a good default to use 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-02-21 13:51:08 +10:00
Brian Goff
349adf4d4d Add extra info regarding docker run funcationality 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-02-18 15:08:09 -05:00
Sven Dowideit
940c381dd5 my attempt to disentagle repository and registry (Issue #1439) 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-02-18 20:16:08 +10:00
Vincent Batts
5f84d7f314 execdriver flag for docker daemon 
like the storage-driver flag, this implements a flag for choosing the
  execdriver to be used, defaulting to lxc.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-02-17 20:03:53 -05:00