Commit Graph

1254 Commits

Author SHA1 Message Date
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
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
Sven Dowideit d45538f243 Merge pull request #4231 from thschroeter/correct-port-range-in-os-x-install
Correct port range in OS X installation doc
2014-02-20 10:26:11 +10:00
Tianon Gravi 42b97be441 Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-19 16:54:24 -07:00
unclejack 73a277eb2f don't skip cert check for an example & use HTTPS
This changes two URLs from http to https and it fixes a Dockerfile to
stop skipping certificate validation. It also adds the ca-certificates
package to that Dockerfile example.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-20 01:11:04 +02:00
Dan Williams 6073b450e8 FIX: Linux mint troubleshooting tip
Package is called 'cgroup-lite' not 'cgroups-lite'. Verified on Linux Mint 16.

Ref http://packages.ubuntu.com/search?keywords=cgroup-lite

Docker-DCO-1.1-Signed-off-by: Dan Williams <me@deedubs.com> (github: deedubs)
2014-02-19 17:30:21 -05:00
Andy Rothfusz 16c2031137 Merge pull request #4225 from cpuguy83/4208-update_docs_to_better_explain_docker_run
Doc: Add basics for controlling a container's lifecycle
2014-02-19 13:31:31 -08:00
Andy Rothfusz 196702fbf9 update links
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-02-19 10:32:43 -08:00
Thomas Schroeter 8a289a8a54 Correct port range in OS X installation doc
Docker-DCO-1.1-Signed-off-by: Thomas Schroeter <thschroeter@gmail.com> (github: thschroeter)
2014-02-19 11:21:29 +00:00
Andy Rothfusz 05c692d64e Update the documentation docs with new branch information.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-02-18 19:21:12 -08:00
Brian Goff 6dc2f55136 Add basics for controlling a container's lifecycle
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-02-18 22:11:29 -05:00
Sven Dowideit e2da84ee63 we moved the repo
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-19 11:35:58 +10:00
Andy Rothfusz ba3cbeb86b Merge pull request #4173 from SvenDowideit/add-most-spacing-to-headers
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
2014-02-18 16:55:10 -08:00
Andy Rothfusz 1308673965 Merge pull request #4210 from cpuguy83/4208-update_docs_to_better_explain_docker_run
Add extra info regarding docker run funcationality
2014-02-18 15:44:26 -08:00
Andy Rothfusz 836a49a46e Merge pull request #4114 from SvenDowideit/update-sshd-example
update the sshd example to use just a Dockerfile
2014-02-18 12:12:52 -08: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
Andy Rothfusz 3a2fa54857 Merge pull request #4147 from float64/patch-1
Env Clarification
2014-02-18 12:07:39 -08:00
Andy Rothfusz 57c4f7185d Merge pull request #2980 from SvenDowideit/1439-add-registry-repository-terms
my attempt to disentagle repository and registry
2014-02-18 11:26:45 -08:00
Andy Rothfusz c14c539c6c Merge pull request #4145 from SvenDowideit/redo-python-example
touch up the examples
2014-02-18 11:08:45 -08:00
Matthias Kühnle 311cb5ca45 Reword - one sentence :-)
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 16:04:47 +01:00
Matthias Kühnle c1dfc63845 Updated environment description
.. to make it even more clear that this env variables are there because of the --link option.

Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 12:47:44 +01:00
Matthias Kühnle d73d3b03e4 Reworded description of the environment variables
Removed the "test now..." b/c the code example is only about inspection
of env-variables.
Test follows in the next section.

Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 12:36:14 +01:00
Matthias Kühnle 8a3cb0c65e Fixed misspelling
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 11:38:23 +01:00
Matthias Kühnle a7f1b74dd8 Env Clarification
Clarified that the env variables here are an example output of env. The user should not set them to the example values.

Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 11:36:46 +01:00
Sven Dowideit a049e93a4c try out @metalivedev's suggestion, including FQIN
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-02-18 20:16:09 +10: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
James Turnbull ef844adc3e Merge pull request #4196 from mahata/fixTypo
Fix typo in 'Using Supervisor with Docker' example
2014-02-17 22:48:54 -05:00
Yasunori Mahata 68de32888b Fix typo in 'Using Supervisor with Docker' example
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com> (github: mahata)
2014-02-17 19:43:56 -08:00
Sven Dowideit 29f7e1bfcb suggested improvements
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
Sven Dowideit b05602a0fe update a new movie: http://asciinema.org/a/7658
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
Sven Dowideit f535a58959 swap busybox for ubuntu, its quicker..
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
Sven Dowideit 3036b5a196 rejig the helloflask example as more advanced, and move it to the end
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-18 13:23:28 +10:00