9fa228bf68
fixed postgresql conf setting
...
small typo, changed listen_address to listen_addresses
Upstream-commit: 83acd37161ed7149843546a779a95fdaf3e2458f
Component: engine
2013-08-19 14:20:25 +01:00
fd36c14020
Fix #1517 , #1521 by adding sudo to examples and installation.
...
Upstream-commit: d4eab77f0c604e10f63519833dc25fbd5a3419bf
Component: engine
2013-08-14 16:21:36 -07:00
62138d17f2
Merge pull request #1508 from pborreli/typos
...
Fixed typos
Upstream-commit: 90cb66f08d139079601dbbedf1fa9706d1bf5738
Component: engine
2013-08-12 15:17:02 -07:00
64cd837579
Merge pull request #1504 from zaiste/docs/postgresql-service
...
docs/postgresql: PostgreSQL service on Docker example
Upstream-commit: 13acf72a3e21fe1d1515deb6a421181817822086
Component: engine
2013-08-12 14:47:19 -07:00
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
e65d5282fa
fix/docs: ubuntu instead of base, note about root-only
...
Upstream-commit: 3af60bf37565de35643c95eae9fd4ddc863c21fc
Component: engine
2013-08-12 15:30:52 +02:00
f87f880dcc
docs/postgresql: PostgreSQL service on Docker example
...
Upstream-commit: d52c1490753cb924aa2aeeefc92fbe7a985f4cd3
Component: engine
2013-08-12 12:03:43 +02:00
1c6718b33c
Adding a reference to ps -a
...
It was confusing to me as a first-time user that my docker attach command failed; I was expecting the container to run continuously, and when I couldn't attach to it, I assumed something was wrong. ps -a shows that the container still exists, which gives the user confidence to go to the next step.
Upstream-commit: 529ee848da1f1dd4b628c3396289b4bcffdbd540
Component: engine
2013-08-11 17:27:47 -07:00
09df97c0f0
Merge branch 'docs-example-fix' of git://github.com/faizkhan00/docker
...
merges #1402
Upstream-commit: 7c03bd1e7a8c62fcbcfeaf7d11809098fb347164
Component: engine
2013-08-05 18:21:19 -07:00
33a79b5058
Merge pull request #1404 from dnordberg/fix-base-refs
...
'Base' image is depreciated and should no longer be referenced in the docs.
Upstream-commit: dcc1e3562f26f86eb532c5a6724c2ae59999e28e
Component: engine
2013-08-05 13:24:05 -07:00
9ddc15ebda
Minor typos found while reading docs
...
Upstream-commit: ce97a71adf879a228f352ee10b7fb62ff86bc4e6
Component: engine
2013-08-05 22:47:16 +08:00
8681336287
'Base' is depreciated and should no longer be referenced in the docs.
...
https://groups.google.com/forum/\#!topic/docker-club/pEjqMgcrnqA
Upstream-commit: 51d0c9238bb01088c08048e022b948a292f815ab
Component: engine
2013-08-05 01:34:32 +03:00
7c9fe26485
bash commands while in the container aren't in the transcript! Added.
...
Upstream-commit: 22df1249b582a80f0a1c57d647549d0b91f1cb30
Component: engine
2013-08-04 08:26:56 -05:00
86d430ea32
Fixed a couple of minor syntax errors.
...
Upstream-commit: 9ba998312de5826f24f693c8518ecda700135b4b
Component: engine
2013-07-30 01:39:29 -04:00
65fe379064
Use the canonical 'ip' commands to make it easier for new 'iproute2' users to understand the usage.
...
Upstream-commit: bc9b91e501369264966263fc28bb516e6048b7e5
Component: engine
2013-06-19 00:57:43 +02:00
3fe9ccaf5e
Fixed #923 by replacing the usage of 'ifconfig' with 'ip a' where appropriate and added a note to use 'ip a' instead of 'ifconfig' for a screencast transscript.
...
Upstream-commit: c2e95997d4c4dda9edbb4adaab8920f1b5982c25
Component: engine
2013-06-18 19:55:59 +02:00
43b70fa498
Document installation of npm dependencies /ht @grigio
...
Upstream-commit: 82dadc200593e39f0979159d46afccf64f1e7a83
Component: engine
2013-06-02 20:10:22 -07:00
a432f97e17
Add link at the beginning
...
Upstream-commit: 464765b940c8194c302b89891dc06b8fcc1b37ff
Component: engine
2013-06-01 22:16:26 -07:00
409c1d534a
Add Node.js web app example using CentOS
...
Upstream-commit: e9ffc1e49998d42f37b39cd23b56b73f7dc0e3da
Component: engine
2013-06-01 22:06:53 -07:00
a6d08b401d
Name examples consistently
...
Upstream-commit: 157547845acd8a0633df72e01d22bad9cbec578b
Component: engine
2013-06-01 22:03:28 -07:00
74278bf53f
Use title case for consistency
...
Upstream-commit: 2935ca7ee2879723c786b86ee87cc1be26dad7b8
Component: engine
2013-06-01 22:03:12 -07:00
cf5d33839b
Add more tags
...
Upstream-commit: e3fd61ad74521b1a94502cf8dcc7c450f035c168
Component: engine
2013-06-01 21:27:27 -07:00
86f679c012
Fix minor documentation error in ‘Running Redis Service’ example
...
Upstream-commit: fd0c501e6d65b665cba87f3449e02a722d90e6b1
Component: engine
2013-05-31 12:19:49 -07:00
613b6a4f42
updated the running ssh service example with the video's transcription
...
Upstream-commit: c7af917d13c34c6a008df60fa45079fab32cea70
Component: engine
2013-05-29 11:29:30 -07:00
de6c1ab33b
Use 127.0.0.1 instead of hostname in the "access the web app" section.
...
Upstream-commit: 056698b67678d7dd687e08401386c35cd5cb9d77
Component: engine
2013-05-22 12:54:50 -07:00
196dbee62c
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
docs/sources/examples/python_web_app.rst
Upstream-commit: b4198de6bfb122ca2654a500a0b7bedb5e94badc
Component: engine
2013-05-22 12:52:14 -07:00
eb4c932aff
Apparent typos in the docs.
...
Upstream-commit: 5818813183bfb61180846f2b1b23a6fdcb2c9cdd
Component: engine
2013-05-21 21:45:27 -06:00
78fdb08a7e
Install curl; nix stray backslash; use proper IP address
...
Upstream-commit: 3a9ef5f9bbae19ae5ac4108dbbaed649e26d942e
Component: engine
2013-05-20 16:31:39 -07:00
b4d01cb61a
Added a "we are hiring" to the frontpage of the docker website, and fixed two broken links in the docs.
...
Upstream-commit: 537cce16f2776d076c58b80e9af7e9914e5dac74
Component: engine
2013-05-17 19:35:46 -07:00
8767bd1f29
Updated commands index to show better title.
...
Small syntax fix in couchDB
Upstream-commit: 8946b75a0b8bce77f630020f6c0fcdae3404b922
Component: engine
2013-05-10 12:25:02 -07:00
ce106440a9
CouchDB example page was titled redis
...
Upstream-commit: 0a13ce9befa57c45941b01cf71675e87d878fca4
Component: engine
2013-05-07 08:33:29 -04:00
283609708c
+ Documentation: new example: sharing data between 2 couchdb databases
...
Upstream-commit: 701132259d843087fafb30d7a1feb05d1b4f7a8e
Component: engine
2013-05-03 15:13:12 -07:00
5cff06982a
Fixed remaining issues and conflicts created by last merge.
...
Upstream-commit: 1ddca1948bbfd77ad3c4f0eeda640c39d315d9ae
Component: engine
2013-04-23 12:04:53 -07:00
5e92f87f4e
Merged changes
...
Upstream-commit: 4031a01af1658225344af04be0dbd4225893c242
Component: engine
2013-04-22 18:38:42 -07:00
b79707c599
Fix examples in README to no longer rely on standalone mode
...
Upstream-commit: 3ae5c45d9a75befdd144d689a70c32180b0a16c6
Component: engine
2013-04-18 22:22:00 -07:00
aa4c6e3497
incorporate feedback for improving the PR
...
Upstream-commit: 4ab241c93080d8df6db4fd0c31b0c26008118422
Component: engine
2013-04-09 18:04:01 -04:00
bdbf282ee6
Merge github.com:dotcloud/docker into 333-redis-documentation
...
Upstream-commit: 418ef43fbb59d62dca20905bbc0753892ecb6c27
Component: engine
2013-04-09 16:07:40 -04:00
5cd0f30a95
add documentation for running a redis process with docker
...
Upstream-commit: 8f15c423e6049507908ec6e7b139f8bccbd6d3ba
Component: engine
2013-04-09 11:04:14 -04:00
318f58e654
Added code and color for 'note' and updated the hello world note.
...
Upstream-commit: 2832ea0cfeb8eb69cf42db5ec0a115300e1383b9
Component: engine
2013-04-08 20:10:47 -07:00
0231b887bd
Merge pull request #347 from kencochrane/303_docs_fix
...
improved the example docs to help #303
Upstream-commit: b8f9803459bdc151593720cb6148d6eb14972bb4
Component: engine
2013-04-08 11:50:07 -07:00
4e538f07a8
Extend the documentation covering the web app example
...
Make it clear how to access the web app running inside of the container
from the host.
Upstream-commit: 72fdb4106997799df49faffb96de1d076e8ad755
Component: engine
2013-04-08 17:39:30 +02:00
36efc4e5a2
added headers to examples linking back to running the examples page
...
Upstream-commit: 6eb8a74ff9aee90fe488de151fab6ec234b61d2a
Component: engine
2013-04-07 10:23:00 -04:00
05821916a6
made a new running the examples page, and added a link to the top of each example to the page to show people how to run them.
...
Upstream-commit: 81ebf4fcf6fe3521c606b5abcbe151176c51aca9
Component: engine
2013-04-07 10:21:08 -04:00
908cac785f
Fix broken link in doc site.
...
Broken link was from python_web_app to nonexistent "base commands page"; updated to point to next item in examples menu, running_ssh_service screencast.
Upstream-commit: 92186d7cf71acbf4027e390b33590570cf4ff290
Component: engine
2013-04-03 22:23:17 -07:00
38ad5f3006
Fixed a lot of language and small things.
...
Upstream-commit: 81874ad4425ed1a3520944bfcced271041e7b0f4
Component: engine
2013-04-01 19:11:09 -07:00
996e1c5e82
Added a lot of basic instructions on various topics
...
Upstream-commit: 64376481767a6a4a1d2b90b225a6ac5bf6bc16f9
Component: engine
2013-03-29 17:30:10 -07:00
52aecd4a56
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Conflicts:
docs/sources/examples/python_web_app.rst
Upstream-commit: 09910785c80822fad71127db4ec30b3de8c27f08
Component: engine
2013-03-28 12:48:32 -07:00
746cb02751
fixed some of the syntax in example
...
The example was broken, I updated it to work with latest version of code.
Upstream-commit: 5c639118d35c1c2048123e94fd4b9ff9b98c89dc
Component: engine
2013-03-28 15:51:10 -03:00
4f5f536f6e
Removed $'s from examples to make them easier to copy paste
...
Upstream-commit: 9bc7e71f16365f21c1b54ad1c16188eda668296e
Component: engine
2013-03-28 11:50:00 -07:00
9de6b5992b
Merge remote-tracking branch 'origin/docs'
...
Upstream-commit: 47e5d2f5e1af88f75faa7391fb29644b3254a8ae
Component: engine
2013-03-28 11:12:00 -07:00
