Commit graph

130 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
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
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
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
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
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
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
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
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
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
2ba0861ad3 Add Sam's Go "dockerclient" to the list of Client Libraries
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-14 17:20:22 -06: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
Guillaume J. Charmes
915d967f55
Update email + add self to pkg/signal
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-10 20:26:45 -07:00
Sven Dowideit
b348ee0fd0 add Net::Docker CPAN module
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-11 20:28:26 +10: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
Andy Rothfusz
44fc1dfca2 Merge pull request #4475 from ubermuda/patch-1
Added Docker-PHP to the list of client libs
2014-03-06 14:54:33 -08: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
Geoffrey Bachelet
511b57bee5 Added Docker-PHP to the list of client libs
Docker-DCO-1.1-Signed-off-by: Geoffrey Bachelet <geoffrey.bachelet@gmail.com> (github: ubermuda)
2014-03-06 20:33:51 +01: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
Sven Dowideit
8d947da826 Merge pull request #4468 from bcbcarl/4467-dockerjs-outdated
Flag 'docker-js' as outdated (Fix #4467)
2014-03-06 09:37:34 +10:00