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
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
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
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
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
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
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
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
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
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
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
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
b1aa1c1a6a
Merge pull request #4147 from float64/patch-1
...
Env Clarification
Upstream-commit: 3a2fa54857d23e0070c7818eb9752ef263e0a9fe
Component: engine
2014-02-18 12:07:39 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
6180b3b390
Add dockerode NodeJS implementation
...
Also correctly case 'JavaScript'
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: mikemaccana)
Upstream-commit: 02d94dcf6ec2541c66b081d4dc251725f994747c
Component: engine
2014-02-17 14:04:47 +00:00
4dc8b80613
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 6a5a1d44f5d6c1281a66d562b7a4310dd6c3b997
Component: engine
2014-02-17 12:24:19 +10:00
66f105510e
add a little reenforcement to the help for docker build -q
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 797b7d3446304be01c220c29f3dc6c4dcc2711be
Component: engine
2014-02-17 11:35:55 +10:00
ec297483f8
change the -H TCP / docker group warning to not reference a resolved issue
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 8871fd3a317240dbd6d5a9ae3309726281572bc1
Component: engine
2014-02-17 10:02:23 +10:00
ef1966871e
update the sshd example to use just a Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a6182dc62ea335c40961c7e528b38b85d2569d07
Component: engine
2014-02-14 13:27:58 +10:00
8326694294
Merge pull request #4120 from apocas/master
...
Image tag endpoint HTTP code typo
Upstream-commit: a4d1da709eae456888a3bdc35cd7a04a06ead7cb
Component: engine
2014-02-13 15:49:45 -08:00
3670248b8d
Merge pull request #4108 from unclejack/remove_default_tcp_bind_address
...
disallow tcp:// from defaulting to 127.0.0.1:4243
Upstream-commit: 6cb0a7e04e23ea6bc8694a6a7489ce226e01151e
Component: engine
2014-02-13 11:44:31 -08:00
9d6155e45c
Image tag endpoint doc typo.
...
Docker-DCO-1.1-Signed-off-by: Pedro Dias <petermdias@gmail.com > (github: apocas)
Upstream-commit: 3417dd4b3bef88d4da0deac520bbf150ba9c183b
Component: engine
2014-02-13 18:11:07 +00:00
171ba8d692
disallow tcp:// from defaulting to 127.0.0.1:4243
...
This stops docker from accepting tcp:// as a valid bind address.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 31dde3ea05e1cf4c1f45083c1b6129e8c2a362df
Component: engine
2014-02-13 13:54:37 +02:00
93967c393a
Merge pull request #4111 from merriam/patch-4
...
Minor error in example code (resubmit #4109 )
Upstream-commit: cddea301ab4a4d5ba32c1d1bb22f029fcf1a8edd
Component: engine
2014-02-12 18:34:17 -08:00
60f7a02d07
Minor error in example code (resubmit #4109 )
...
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com > (github: merriam)
Upstream-commit: ba650e05177bcc2597606b998a104a29698d5064
Component: engine
2014-02-12 18:13:46 -08:00
8934e64a02
(resubmit) Add notes about OS/X and remote daemons
...
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com > (github: merriam)
Upstream-commit: 2a17bdce9e6e25e9be225fede7aac0b12729d82f
Component: engine
2014-02-12 18:11:01 -08:00
3648d21c65
tell the reader that they need git and make for this tutorial
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: d9f215eb2a48e6e836af9cc4015c73f17dc5be9e
Component: engine
2014-02-12 16:30:18 +10:00
1cb1e79554
fix underline/heading
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 6fd8e5d976e872447447d8c25d20d525305f281d
Component: engine
2014-02-11 16:53:08 -08:00
c691ff08d3
Merge pull request #4034 from SvenDowideit/postgres-example
...
rewrite the PostgreSQL example using a Dockerfile, and add details to it
Upstream-commit: e9e4b8dc15fcf01fb793cd65ebfa822420d56fe8
Component: engine
2014-02-11 16:49:22 -08:00
afe2170b4f
rewrite the PostgreSQL example using a Dockerfile, and add details to it
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 2ed2ba4e8caa2d70d57d124a2f3509f400d8187e
Component: engine
2014-02-12 10:30:57 +10:00
da8055c21a
Merge pull request #3988 from dafyddcrosby/fix_formatting
...
Fix RST formatting
Upstream-commit: 73967417579a44a4597e8d3e818248f8c98a1c97
Component: engine
2014-02-11 16:30:21 -08:00
04ccad7a77
Merge pull request #4057 from SvenDowideit/add-P-docs
...
add a little more information about the docker run -P option
Upstream-commit: 7fe8b50e2ee9ba0b237827f95980dcf6e1a41fb4
Component: engine
2014-02-11 16:27:25 -08:00
ba35f17949
Merge pull request #4054 from SvenDowideit/boot2docker-upgrade-doc
...
add a little info on upgrading b2d
Upstream-commit: ff2260099ab8669241e3cedd2edd3afe0fb34f4d
Component: engine
2014-02-11 16:23:11 -08:00
