centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 00:08:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,092 Commits 54 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

4435 Commits

Author SHA1 Message Date
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
Victor Vieux
954a913c1f Merge pull request #2 from SvenDowideit/docker_run_-it_docs 
add a little bit mentioning commandline option combinations

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-03 18:48:47 +00:00
James Turnbull
37893c3db0 Merge pull request #4406 from funkymonkeymonk/voldocs 
adding note that host-volumes must be defined using absolute paths
 2014-03-02 23:19:09 -05:00
Ian Truslove
3de1d25c11 Fix minor typo 2014-03-02 13:32:48 -07:00
James Turnbull
b187d7ae41 Added documentation (and some cleanup) around small patch exemptions 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-03-02 11:43:18 -05:00
FunkyMonkeyMonk
3ddfbf6880 adding note that host-volumes must be defined using absolute paths 
Docker-DCO-1.1-Signed-off-by: Will Weaver <monkey@buildingbananas.com> (github: funkymonkeymonk)
 2014-03-01 20:43:53 -05: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
Sven Dowideit
5fde31ba9c add some info wrt backup and restore of volumes 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-03-01 08:44:01 +10: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
Andy Rothfusz
ba2a042aea Merge pull request #4390 from SvenDowideit/spelling-1 
one ponted out by lukaspustina, and one that I bet I added
 2014-02-28 13:39:40 -08:00
Andy Rothfusz
70d2ca4ed3 Merge pull request #4319 from jlhawn/docs-docker-io-api 
Added documentation for docker.io OAuth & Accounts
 2014-02-28 13:35:33 -08: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
Josh Hawn
b6a5082bd1 Updated OAuth docs per arothfusz's comments 
Added emphasis of https for OAuth interactions.
Updated example URIs to use HTTPS
Included redirect hostname on authorization page.

Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com> (github: jlhawn)
 2014-02-27 14:21:24 -08: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
Andy Rothfusz
ce8a735248 Merge pull request #4318 from robpc/patch-1 
Fixed typo in Dockerfile example
 2014-02-27 10:19:09 -08:00
robpc
1475dafd52 Fixed typo in Dockerfile example 
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com> (github: robpc)

The 'true' command is located in /bin not /usr/bin in the busybox image.
 2014-02-26 19:38:51 -05: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
Andy Rothfusz
d373cb8c89 Merge pull request #4323 from timruffles/patch-2 
help contributors be more productive
 2014-02-25 15:03:30 -08: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
Victor Vieux
21f56c04e4 fix doc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:08 +00:00
Victor Vieux
e7cc88c39f bump API version 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:07 +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
Tim Ruffles
9c4799b7e7 help contributors be more productive 
certainly saved me time after I found this in hack/make.sh :)

Docker-DCO-1.1-Signed-off-by: Tim Ruffles <oi@truffles.me.uk> (github: github_handle)
 2014-02-24 23:07:40 +00:00
Josh Hawn
00bb76f35b Added documentation for docker.io OAuth & Accounts 
OAuth docs:
  documented the OAuth authorization flow and how to register your application

Account docs:
  documented getting/updating user profile data
  documented getting/updating user email data

Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com> (github: jlhawn)
 2014-02-24 13:48:43 -08:00
Guillaume J. Charmes
8cfa7715c7 Merge pull request #4281 from unclejack/remove_vagrantfile 
Remove Vagrantfile and remove it from all docs
 2014-02-24 11:39:11 -08:00
Brian Goff
cfdfd46e49 Remove uneeded wording in Dockerfile format 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-02-23 15:45:44 -05:00
unclejack
67d55860a5 Remove Vagrantfile and remove it from all docs 
This removes the Vagrantfile and updates the documentation to remove
the steps which explain how to install Docker in a VM via Vagrant.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-02-22 03:25:32 +02:00
Sven Dowideit
f36d455144 Merge pull request #4245 from manuel-woelker/docs-remote-api 
Added some documentation for the JSON params in the /containers/create and /containers/(id)/start remote APIs
 2014-02-22 10:15:20 +10:00
Andy Rothfusz
36fd9f3c53 Merge pull request #4280 from dpb587/bugfix-mtu-typo 
Fix argument usage typo for docker --mtu
 2014-02-21 10:59:42 -08:00
Andy Rothfusz
0c8c87d9ff Merge pull request #4277 from SvenDowideit/tianon-made-me-doit 
small update to API docs to go with #4276
 2014-02-21 10:57:51 -08: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
Manuel Woelker
c3faab3955 docs: document some JSON parameters /containers/create and /containers/(id)/start in remote api (fixes #2948) 
Docker-DCO-1.1-Signed-off-by: Manuel Woelker <github@manuel.woelker.org> (github: manuel-woelker)
 2014-02-21 19:25:49 +01:00
Michael Crosby
ab63975b8e Merge pull request #4260 from unclejack/onbuild_fixes 
forbid chained onbuild, from & maintainer triggers
 2014-02-21 12:50:40 -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
James Turnbull
ea9dd4ca59 Merge pull request #4248 from unclejack/https_fixes 
don't skip cert check for an example & use HTTPS
 2014-02-21 10:47:44 -05:00
Sven Dowideit
f83e553452 small update to API docs to go with #4276 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-02-21 17:42:02 +10: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
Andy Rothfusz
a5515d27e5 Merge pull request #4233 from deedubs/patch-1 
FIX: Linux mint troubleshooting tip
 2014-02-20 18:07:39 -08:00
Andy Rothfusz
2018d4f9cd Merge pull request #4251 from tianon/add-back-grub-info 
Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
 2014-02-20 18:04:50 -08:00
Andy Rothfusz
bb368b0563 Merge pull request #4261 from amouat/patch-1 
Fix misspelling
 2014-02-20 17:13:54 -08:00
Andy Rothfusz
93b98c9fe3 Merge pull request #4252 from SvenDowideit/mention-scratch-image 
lets talk about the other way to make base images
 2014-02-20 17:12:36 -08:00
unclejack
b829e96cde forbid chained onbuild, from & maintainer triggers 
This changes the way onbuild works:
- forbids the chaining of onbuild instructions
- forbids the use of `onbuild from`
- forbids the use of `onbuild maintainer`

It also makes docker throw errors when encountering such triggers when
executing the triggers during `FROM`.

Three tests have been added:
- ensure that chained onbuild (`onbuild onbuild`) is forbidden
- ensure that `onbuild from` is forbidden
- ensure that `onbuild maintainer` is forbidden

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-02-20 20:31:04 +02:00
unclejack
cae554b32e docs: explain DNS warnings & how to fix them 
This explains how to fix the DNS warnings on Ubuntu and why they're
shown.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-02-20 19:53:05 +02:00
Adrian Mouat
88d24df668 Fix misspelling 
Docker-DCO-1.1-Signed-off-by: Adrian Mouat <adrian@adrianmouat.com> (github: amouat)
 2014-02-20 16:55:07 +01:00
James Turnbull
ef82662158 Site ver for Webmaster tools 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-02-20 08:51:39 -05:00
Sven Dowideit
9f1c69ca7b lets talk about the other way to make base images 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-02-20 13:49:15 +10:00