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
ce6d62db16
Merge pull request #1387 from joevandyk/patch-1
...
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
Upstream-commit: 7c9604e32beea824238c0f2ac055577feb307786
Component: engine
2013-08-05 16:14:57 -07:00
46b7e044d5
Fixed some typo's and formatting issues in remote api documentation.
...
Upstream-commit: ff6b6f2ce1f51c38b00d1a70376182645b4a0c85
Component: engine
2013-08-05 15:55:40 -07:00
c001846be2
Merge pull request #1303 from dhrp/update-spinx-for-man
...
Enabled the docs to generate manpages.
Upstream-commit: d49f141fb3dc79bc4a22bbf398410f8d712bcf36
Component: engine
2013-08-05 15:31:51 -07:00
00a7cbd80b
Merge pull request #1290 from dotcloud/parallel_pull
...
* Runtime: Parallel pull
Upstream-commit: e54e8fa9205409e741a64c7d7746e2e548c52fc0
Component: engine
2013-08-05 14:17:29 -07:00
2bc60625b2
Merge pull request #1390 from grobie/clarify-amazon-documentation
...
Clarify Amazon EC2 installation type
Upstream-commit: baa4618e57eadcb320dcd0b93ab2bd0dedee7d5a
Component: engine
2013-08-05 13:26:28 -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
d457571635
rebase master
...
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
2013-08-05 16:25:42 +00:00
9ddc15ebda
Minor typos found while reading docs
...
Upstream-commit: ce97a71adf879a228f352ee10b7fb62ff86bc4e6
Component: engine
2013-08-05 22:47:16 +08:00
8f44de0140
Merge pull request #1400 from gorsuch/doc-typo
...
* Documentation: fix a typo in the ubuntu installation guide
Upstream-commit: a37b42b57cd1f372c1583fa3b46b30120401e2ff
Component: engine
2013-08-05 07:05:27 -07:00
bd5fa21461
add docs
...
Upstream-commit: a97cf23355e661d0336a71b5225ad463efa41297
Component: engine
2013-08-05 11:07:27 +00: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
e591df1e08
typo: s/connexions/connections
...
Upstream-commit: db0ccaac9b4e9e12d4e33e5d48e437771aaf8dcd
Component: engine
2013-08-03 22:11:59 -05:00
b034acd005
Clarify Amazon EC2 installation type
...
Make clear this documentation is about installing docker on EC2 with the
help of vagrant, which doesn't make it easy to start multiple instances,
instead of plain vanilla EC2 installation.
Upstream-commit: 708cd3458696101a4aa78d4e8086a29158e133cf
Component: engine
2013-08-03 17:31:20 +07:00
a616b1d2ff
Merge pull request #1375 from grobie/patch-1
...
Move note about officially supported kernel
Upstream-commit: b1d994e3b93280bbe55d208c51e4d9fa712f388f
Component: engine
2013-08-02 17:24:15 -07:00
294e6e6582
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
...
Upstream-commit: b6bff0cbb15535b3d1bc991b975c3df35061aa83
Component: engine
2013-08-02 15:10:57 -07:00
f9de212d00
Merge pull request #1384 from crosbymichael/1326-build-without-cache
...
* Builder: Add no cache for docker build
Upstream-commit: ead7eb619ed5a60a5ffab62827aa4a3c761504e8
Component: engine
2013-08-02 14:38:34 -07:00
b6c9a46ec6
Merge pull request #1336 from dotcloud/fix_ADD_permissions
...
Builder: Make sure ADD will create everything in 0755
Upstream-commit: 0f088d28c52f9163f1d50336b9da9cf770c955b9
Component: engine
2013-08-02 13:52:19 -07:00
96cf1ff846
Merge pull request #1343 from dotcloud/ufw_doc
...
Add ufw doc
Upstream-commit: 09ab2bfa1d7597fbaadef98ce74817152f225365
Component: engine
2013-08-02 13:33:26 -07:00
ac12d9b409
Add no cache for docker build
...
Add a new flag to disable the image cache when building images.
Upstream-commit: 3a123bc479457c4dfa14e39b7c42d9a9dccf8c32
Component: engine
2013-08-02 16:18:54 +00:00
da0dfa9ebd
Move note about officially supported kernel
...
It seems this a general note about kernel issues and not specific to Cgroups or namespaces.
Upstream-commit: 2424480e2ce14d848c041c53cc041aab91308081
Component: engine
2013-08-02 12:24:38 +07:00
9fb9438668
Some more improvements on the docs readme. Removed references to website.
...
Upstream-commit: ad3b091d535cde5544ec3c11da4cf8d9b278a325
Component: engine
2013-07-31 13:59:56 -07:00
0a6a10bae5
Updated docs README with instructions to preview the generated manfile, and where to get the one generated by sphinx.
...
Upstream-commit: 26229d78f2b77592ab6761a4ffce38ab7d859f3b
Component: engine
2013-07-31 13:44:10 -07:00
d69f94df65
Solved the logo being squished in Safari
...
Upstream-commit: e0c24ccfc37b64eb919c5675d8a8f383201fa7cb
Component: engine
2013-07-31 12:17:42 -07:00
6241318046
rebase master
...
Upstream-commit: 108635582f410c4c767f0e49f4b772a9208e12da
Component: engine
2013-07-31 15:32:08 +00:00
d2c440fbc7
add parallel pull to 1.4
...
Upstream-commit: 46f59dd9333baa578b184eb25b386ac2f41caf04
Component: engine
2013-07-30 12:15:33 +00:00
d8352677c8
Merge branch 'master' into 1237-improve_docker_top-feature
...
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
fb6e560276
add ufw doc
...
Upstream-commit: 7d0b8c726c0d178291063751ac735d6caebfb45a
Component: engine
2013-07-30 13:47:29 +02:00
091d56f759
Merge pull request #1342 from dsissitka/patch-4
...
Fixed a couple of minor syntax errors.
Upstream-commit: f2dc49292f775f4c10fc61157cac0b8e15315917
Component: engine
2013-07-30 04:20:05 -07:00
86d430ea32
Fixed a couple of minor syntax errors.
...
Upstream-commit: 9ba998312de5826f24f693c8518ecda700135b4b
Component: engine
2013-07-30 01:39:29 -04:00
7e99f4ac78
Updated the description of run -d
...
The goal is to make it more clear this will give you the container id after run completes.
Since stdout is now standard on run, "docker run -d" is the best (or only) way to get the container ID returned from docker after a plain run, but the description (help) does not hint any such thing.
Upstream-commit: 5dc86d7bca17c2996264a18cc26f06d30e532588
Component: engine
2013-07-29 14:17:15 -07:00
dc88351021
Make sure ADD will create everything in 0755
...
Upstream-commit: f7542664e3efb35b6b153dc2b2cc9cdac181989a
Component: engine
2013-07-29 11:03:09 -07:00
d391806121
Clean up 'manifesto' in docs
...
Upstream-commit: a97d858b2a0d6bc4d044a241036b97fd78f93022
Component: engine
2013-07-26 10:21:17 -07:00
71ca6b4378
fix docs
...
Upstream-commit: 513a5674831fd952fc8e7b8fbdbc4939393ecb5b
Component: engine
2013-07-26 10:04:46 +00:00
2ad5267228
Enabled the docs to generate manpages.
...
* changed conf.py to reference toctree.rst instead of index
* Added note to README to upgrade your sphinx to the latest version to prevent a bug with .. note:: blocks.
Upstream-commit: f4b63d9eeaddae6cb15775bea13ec4bca6e115da
Component: engine
2013-07-25 17:19:58 -07:00
41fd022aa4
Merge pull request #1274 from dhrp/headings_website
...
Removed website and updated headings.
Upstream-commit: 422378cb85b1a158373ea8e5a2dc2de92076d225
Component: engine
2013-07-25 16:43:27 -07:00
8ad99ad99c
Merge pull request #1288 from dlintw/1286-improve-import-txz-description
...
Fixes #1286 improve-import-txz-description
Upstream-commit: 9cc8b72a38491efbaf86f3d13689bc13ef74d32d
Component: engine
2013-07-25 12:37:37 -07:00
c0c3fbc7b6
Fixes #1286
...
Upstream-commit: 8f6b6d57840410d1491321d7681ef2a946e90bc9
Component: engine
2013-07-25 15:36:32 +08:00
743adaf705
add kernel version
...
Upstream-commit: 6057e6ad70ba4550df358e89b9a7e1da61666604
Component: engine
2013-07-24 13:36:55 +00:00
764ae64982
Merge branch 'master' into 1167_events_endpoint-feature
...
Upstream-commit: ee05f97c9a8542ded8631a33e343f07f1cecd4de
Component: engine
2013-07-24 11:49:04 +00:00
ff1a26c4e5
Docs: Fixed navigaton links to about page and community page
...
Website: Removed the website sources from the repo. The website sources are now hosted on github.com/dotcloud/www.docker.io/
Upstream-commit: e701dce33978a0206627a02b258da6a0269c4b60
Component: engine
2013-07-23 13:05:06 -07:00
96e4d0d309
Merge branch 'stfp-858-disable-network-configuration'
...
Upstream-commit: a93a87f64a97f36121dbf3a58fff762f94e5dd73
Component: engine
2013-07-23 19:55:50 +00:00
8aa1b36505
Merge pull request #1241 from ryfow/patch-1
...
Make the ENTRYPOINT example work
Upstream-commit: dfc64d157a2a8c387b56a3eea501c726a93f41d0
Component: engine
2013-07-23 08:45:04 -07:00
05d166e113
add docs
...
Upstream-commit: ec559c02b8dd70692821b3dc7f497d6fccaa88ad
Component: engine
2013-07-23 15:42:34 +00:00
be9f5063e4
Merge branch '858-disable-network-configuration' of https://github.com/stfp/docker into stfp-858-disable-network-configuration
...
Upstream-commit: 8165e51eccd15b7eed3939ada6017ed12b9e81b3
Component: engine
2013-07-23 08:44:12 +00:00
fab05b9aee
Added new docker logo to the documentation header, and added other links.
...
Upstream-commit: 58a1c5720a42fde72c27532ce1122609225bc3bb
Component: engine
2013-07-22 20:26:40 -07:00
2e339a6cec
Merge branch 'master' into 1237-improve_docker_top-feature
...
Conflicts:
docs/sources/api/docker_remote_api.rst
Upstream-commit: c81662eae473e2b35e4e449be18cc6dfda07e4ec
Component: engine
2013-07-22 16:22:11 +00:00
e57c33a063
Merge pull request #1158 from cespare/1142-docker-add-fix
...
*Buildfile: determine a filename from a URL if the destination is a directory
Upstream-commit: 4e7f2b757e9b5c1a0960553938570bee2a54e0c6
Component: engine
2013-07-22 07:07:04 -07:00
ab81112793
Merge pull request #1259 from dsissitka/patch-3
...
*Documentation: Updated the stop command's docs.
Upstream-commit: 2bba279cf18ac3a58b59633b0c6757c03328cb10
Component: engine
2013-07-22 06:59:02 -07:00
