Andy Rothfusz
dd7ff4fc5b
Merge pull request #4280 from dpb587/bugfix-mtu-typo
...
Fix argument usage typo for docker --mtu
Upstream-commit: 36fd9f3c53621f27ee5346ef52a6dde6d8e1d580
Component: engine
2014-02-21 10:59:42 -08:00
Andy Rothfusz
5cecf0201f
Merge pull request #4277 from SvenDowideit/tianon-made-me-doit
...
small update to API docs to go with #4276
Upstream-commit: 0c8c87d9ff8a4dcc794c137d69ef3fd91527035e
Component: engine
2014-02-21 10:57:51 -08:00
Danny Berger
773b1a3574
Drop -mtu from docs in favor of --mtu only
...
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com > (github: dpb587)
Upstream-commit: afb565e97c79b87d4563e8e728513ca5b50514c7
Component: engine
2014-02-21 13:43:50 -05:00
Michael Crosby
bd08308ce7
Merge pull request #4260 from unclejack/onbuild_fixes
...
forbid chained onbuild, from & maintainer triggers
Upstream-commit: ab63975b8e4153f65cc9ce200f20c39caec08664
Component: engine
2014-02-21 12:50:40 -05:00
Danny Berger
1ddffb7445
Fix cli argument usage typo for docker --mtu
...
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com > (github: dpb587)
Upstream-commit: 8c4160fe61151f38f471e93e7bf98dcbf5406a9e
Component: engine
2014-02-21 10:51:51 -05:00
James Turnbull
6526146793
Merge pull request #4248 from unclejack/https_fixes
...
don't skip cert check for an example & use HTTPS
Upstream-commit: ea9dd4ca5927dd3694b43287c13fe7f37aaf9108
Component: engine
2014-02-21 10:47:44 -05:00
Sven Dowideit
611dddcc47
small update to API docs to go with #4276
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: f83e553452db74b73e9de7fa770646e72e7af88f
Component: engine
2014-02-21 17:42:02 +10:00
Sven Dowideit
2524fdc1ab
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)
Upstream-commit: e59485e148f5d1ab0cf5ec18ca3bb7c684e8cf7b
Component: engine
2014-02-21 13:51:08 +10:00
Andy Rothfusz
5c958f0de4
Merge pull request #4233 from deedubs/patch-1
...
FIX: Linux mint troubleshooting tip
Upstream-commit: a5515d27e5da9c4442fa9800b8995236d4b5ef2f
Component: engine
2014-02-20 18:07:39 -08:00
Andy Rothfusz
deed4c0865
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
Upstream-commit: 2018d4f9cd1c201d9cb3991b4223cd107daffc63
Component: engine
2014-02-20 18:04:50 -08:00
Andy Rothfusz
ed09089e1d
Merge pull request #4261 from amouat/patch-1
...
Fix misspelling
Upstream-commit: bb368b0563e1c7c2055cc49455ce9a7ba126c713
Component: engine
2014-02-20 17:13:54 -08:00
Andy Rothfusz
bfeed894f7
Merge pull request #4252 from SvenDowideit/mention-scratch-image
...
lets talk about the other way to make base images
Upstream-commit: 93b98c9fe33a86f7ab8add97a6a6de3769cef65b
Component: engine
2014-02-20 17:12:36 -08:00
unclejack
87c3fb28d2
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)
Upstream-commit: b829e96cde4f798bc21f05a763b2f6a623dfe1eb
Component: engine
2014-02-20 20:31:04 +02:00
unclejack
c7ecc00d6b
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)
Upstream-commit: cae554b32e8c3341767e0efe7b9a8977a499d826
Component: engine
2014-02-20 19:53:05 +02:00
Adrian Mouat
6ec2f02312
Fix misspelling
...
Docker-DCO-1.1-Signed-off-by: Adrian Mouat <adrian@adrianmouat.com > (github: amouat)
Upstream-commit: 88d24df6687d64bf0e19c23973da32eed32fda28
Component: engine
2014-02-20 16:55:07 +01:00
James Turnbull
e100a37878
Site ver for Webmaster tools
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: ef826621585a62d9b563e8ab2fd72f731b14817c
Component: engine
2014-02-20 08:51:39 -05:00
Sven Dowideit
c8d7265499
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)
Upstream-commit: 9f1c69ca7b1b2afd96b4d154431395ee48ada97d
Component: engine
2014-02-20 13:49:15 +10:00
Sven Dowideit
d6638f24e8
Merge pull request #4231 from thschroeter/correct-port-range-in-os-x-install
...
Correct port range in OS X installation doc
Upstream-commit: d45538f2431ed385bedcf5e11a9104fdee096073
Component: engine
2014-02-20 10:26:11 +10:00
Tianon Gravi
852e62316c
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)
Upstream-commit: 42b97be441f5272ead365c3400b91fb756565b1a
Component: engine
2014-02-19 16:54:24 -07:00
unclejack
0802cd5e0f
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)
Upstream-commit: 73a277eb2fd66b815b11e9d2caff2c31c18a0854
Component: engine
2014-02-20 01:11:04 +02:00
Dan Williams
785171a902
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)
Upstream-commit: 6073b450e83a67a27ffe8c11ebda36791a7923b4
Component: engine
2014-02-19 17:30:21 -05:00
Andy Rothfusz
97d9349a9d
Merge pull request #4225 from cpuguy83/4208-update_docs_to_better_explain_docker_run
...
Doc: Add basics for controlling a container's lifecycle
Upstream-commit: 16c2031137c5619a67130aa7d4a4f97289d8e808
Component: engine
2014-02-19 13:31:31 -08:00
Andy Rothfusz
98d4bbe0f6
update links
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 196702fbf9905426e590c0dbcb6101e72c62aac6
Component: engine
2014-02-19 10:32:43 -08:00
Thomas Schroeter
569ad8a8f4
Correct port range in OS X installation doc
...
Docker-DCO-1.1-Signed-off-by: Thomas Schroeter <thschroeter@gmail.com > (github: thschroeter)
Upstream-commit: 8a289a8a54480b968a6924536e084d749e567cf0
Component: engine
2014-02-19 11:21:29 +00:00
Andy Rothfusz
83c5ea4b47
Update the documentation docs with new branch information.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 05c692d64ec9cabe6c16385300405406ebe63f40
Component: engine
2014-02-18 19:21:12 -08:00
Brian Goff
2894395a09
Add basics for controlling a container's lifecycle
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 6dc2f5513648c42b2e71e55c4a4ea6cd3073ce55
Component: engine
2014-02-18 22:11:29 -05:00
Sven Dowideit
ee616cd9b4
we moved the repo
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: e2da84ee63b759173d4919481eeb0c3ddf58cfb5
Component: engine
2014-02-19 11:35:58 +10:00
Andy Rothfusz
983d302f63
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
Upstream-commit: ba3cbeb86bafbb6d7553f8954b0bf8d1e2d3f97f
Component: engine
2014-02-18 16:55:10 -08:00
Andy Rothfusz
a4ead08188
Merge pull request #4210 from cpuguy83/4208-update_docs_to_better_explain_docker_run
...
Add extra info regarding docker run funcationality
Upstream-commit: 13086739656d7866ac5da76aef4fa4d5fa378df0
Component: engine
2014-02-18 15:44:26 -08:00
Andy Rothfusz
f1f31be89b
Merge pull request #4114 from SvenDowideit/update-sshd-example
...
update the sshd example to use just a Dockerfile
Upstream-commit: 836a49a46e6ff51a0ef73eb170935f0d138b932e
Component: engine
2014-02-18 12:12:52 -08:00
Brian Goff
24eab2e417
Add extra info regarding docker run funcationality
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 349adf4d4df63cd35ecfd74aa21de01629964ea5
Component: engine
2014-02-18 15:08:09 -05:00
Andy Rothfusz
b1aa1c1a6a
Merge pull request #4147 from float64/patch-1
...
Env Clarification
Upstream-commit: 3a2fa54857d23e0070c7818eb9752ef263e0a9fe
Component: engine
2014-02-18 12:07:39 -08:00
Andy Rothfusz
18d6994efa
Merge pull request #2980 from SvenDowideit/1439-add-registry-repository-terms
...
my attempt to disentagle repository and registry
Upstream-commit: 57c4f7185d18db964f90b10c494eaf271f4d8aa9
Component: engine
2014-02-18 11:26:45 -08:00
Andy Rothfusz
c7021aec80
Merge pull request #4145 from SvenDowideit/redo-python-example
...
touch up the examples
Upstream-commit: c14c539c6c16e604817ea0b4bf8bd7dc58e2a5ac
Component: engine
2014-02-18 11:08:45 -08:00
Matthias Kühnle and Matthias Kühnle
d71035c5b7
Reword - one sentence :-)
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: 311cb5ca45c15c32408d54194470536e73ae016d
Component: engine
2014-02-18 16:04:47 +01:00
Matthias Kühnle
983d3e7de3
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)
Upstream-commit: c1dfc63845cdf08d7609e1890f45d01f10326bda
Component: engine
2014-02-18 12:47:44 +01:00
Matthias Kühnle
e867f9248c
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)
Upstream-commit: d73d3b03e4216bf6cf44b393108dd520acac9670
Component: engine
2014-02-18 12:36:14 +01:00
Matthias Kühnle and Matthias Kühnle
efed40e022
Fixed misspelling
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: 8a3cb0c65e7940e928e31d6e64cce5d81d9975a6
Component: engine
2014-02-18 11:38:23 +01:00
Matthias Kühnle and Matthias Kühnle
e8870b2f18
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)
Upstream-commit: a7f1b74dd812fbc86beefea6fcd3ba4c4abaa7e2
Component: engine
2014-02-18 11:36:46 +01:00
Sven Dowideit
90a166ff8b
try out @metalivedev's suggestion, including FQIN
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: a049e93a4c164de25ce1fc1113f2929aa0aa0b5b
Component: engine
2014-02-18 20:16:09 +10:00
Sven Dowideit
3700ea5ec4
my attempt to disentagle repository and registry (Issue #1439 )
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 940c381dd5898df4dd863a2d76a122b6610f2940
Component: engine
2014-02-18 20:16:08 +10:00
James Turnbull
5633a3d1c6
Merge pull request #4196 from mahata/fixTypo
...
Fix typo in 'Using Supervisor with Docker' example
Upstream-commit: ef844adc3e2ba7ae702109c1bae54668a6a74aac
Component: engine
2014-02-17 22:48:54 -05:00
Yasunori Mahata
92abc1e651
Fix typo in 'Using Supervisor with Docker' example
...
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com > (github: mahata)
Upstream-commit: 68de32888b6bad84cd37ccd165b0e7bb013574af
Component: engine
2014-02-17 19:43:56 -08:00
Sven Dowideit
ca7b056023
suggested improvements
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 29f7e1bfcbe6654d962a55eb5006e248284b9e0c
Component: engine
2014-02-18 13:23:28 +10:00
Sven Dowideit and Sven Dowideit
32cc7c3201
update a new movie: http://asciinema.org/a/7658
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: b05602a0fe6d9b9731cee0008fbac27250f361bd
Component: engine
2014-02-18 13:23:28 +10:00
Sven Dowideit
244da2b520
swap busybox for ubuntu, its quicker..
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: f535a58959809dbb613bf529019f26cc6ae0c6f9
Component: engine
2014-02-18 13:23:28 +10:00
Sven Dowideit
5f957db92e
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)
Upstream-commit: 3036b5a196fdbb744f94299c82dc44078361bdae
Component: engine
2014-02-18 13:23:28 +10:00
Andy Rothfusz
51cf4f7bfe
Merge pull request #4171 from SvenDowideit/4061-remote-api-warning
...
change the -H TCP / docker group warning to not reference a resolved issue
Upstream-commit: c7c825d9a5f53be6f868ff401b1d61cda14e83fe
Component: engine
2014-02-17 14:36:05 -08:00
Victor Vieux
4a474363c9
Merge pull request #4113 from SvenDowideit/build-quiet-help
...
add a little reenforcement to the help for docker build -q
Upstream-commit: 382659e03a59d68007fee1b54192233f7484c035
Component: engine
2014-02-17 10:38:43 -08:00
Song Gao
e184f36805
Support submodules when building from a gh repo
...
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io > (github: songgao)
Upstream-commit: c9ae66ffe375156ddf39cb41664224d6e1a6f096
Component: engine
2014-02-17 12:08:23 -06:00