41337f44f2
Update build doc
...
Upstream-commit: 92939569ab06d13cd179d6e998ef9576d3921bb6
Component: engine
2013-05-29 11:53:44 -07:00
cbcfc9c00c
Update docker build docs
...
Upstream-commit: d97fff60a9275324290bb01b921c9b6b0967a4fd
Component: engine
2013-05-29 11:50:49 -07:00
d4ee5e174d
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 83db1f36e30ff2188ee3cf5908b65534e693654e
Component: engine
2013-05-28 19:39:20 -07:00
52887551f6
Documented who decides what and how.
...
Upstream-commit: 24ddfe3f25f99db5a23f62d411c949b2236288a1
Component: engine
2013-05-28 19:39:09 -07:00
1e4dfca884
Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
...
* API: rename containers/ps to containers/json
Upstream-commit: f65327555e00dcfb2691e8a2df1c57cb011a0898
Component: engine
2013-05-28 15:44:20 -07:00
f9120d99fa
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 522f399d689ebd7ae76ffce07507549ee5887238
Component: engine
2013-05-28 14:57:50 -07:00
f4d5babfe8
De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo.
...
Upstream-commit: 326faec6642896954ffbd407eeda7d19da193856
Component: engine
2013-05-28 14:57:36 -07:00
49e1d5125f
Merge pull request #702 from kim0/patch-2
...
Properly install ppa, avoid GPG key warning. Also closes #715
Upstream-commit: 28a30eda880ceac876c6ce3791672bf1e6b2ebe5
Component: engine
2013-05-28 14:17:59 -07:00
da7e3d29eb
Merge pull request #733 from meejah/master
...
Documentation: Use add-apt-repository instead of editing sources.list
Upstream-commit: f3cc1d985e91e19012c65c0c14c4ddc664438631
Component: engine
2013-05-28 13:55:11 -07:00
85e46e1ff2
Merge pull request #709 from dhrp/links-to-kernel-doc
...
Added links to @jpetazzo 's kernel article, cleaned puppet doc layout
Upstream-commit: 235ae9cd43bbdaba9ea75ecbff8cf2f902e70cb9
Component: engine
2013-05-28 12:07:46 -07:00
ca4176193b
Add sudo to commands.
...
Upstream-commit: 444f7020cbc639fd781744be207c843aaf663077
Component: engine
2013-05-28 10:56:26 -06:00
d4815bdeb7
Use Ubuntu's built-in method to add a PPA repository, which correctly handles keys for you.
...
Upstream-commit: 525080100d2e2a7899c9a51a1ca57e28e32e8488
Component: engine
2013-05-28 10:54:32 -06:00
a20c31a039
rename containers/ps to containers/json
...
Upstream-commit: 4f9443927e8bc8a724b43afae6cf7a183cd9acd0
Component: engine
2013-05-28 16:08:05 +00:00
9a8934c1af
Fix attach API docs.
...
Upstream-commit: 7d6ff7be129d70f0ff5c50a47d70a32a1e6274bc
Component: engine
2013-05-28 06:27:12 -07:00
57720219a1
Merge pull request #657 from offby1/master
...
Minor tweaks to python_web_app.rst
Upstream-commit: d3b9733507746b29e7f3da6f69bddf95f55d9582
Component: engine
2013-05-24 19:19:32 -07:00
fdc407078f
* Registry: specified naming restrictions for usernames and repository names
...
Upstream-commit: df23a1e675c7e3cbad617374d85c48103541ee14
Component: engine
2013-05-24 18:58:24 -07:00
85e0f5a874
Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst
...
Upstream-commit: c5f15dcd3de02a10452963a9c56cb2e587972f58
Component: engine
2013-05-24 14:42:00 -07:00
2b952c89ae
bump to master
...
Upstream-commit: d7b01c049d7f965b972603bc038922342fc67d68
Component: engine
2013-05-24 16:50:16 +00:00
1cfe074da1
use -H
...
Upstream-commit: 92e4a51965ce862ad1b4682a68b33550f2fd613f
Component: engine
2013-05-24 16:49:18 +00:00
f4c4eec030
Properly install ppa, avoid GPG key warning
...
Upstream-commit: 4e576f047fc8a5a75fa88a66132bdade4f3a1e44
Component: engine
2013-05-24 18:55:32 +03:00
2b0dd49ab1
Avoid hardcoding kernel 3.8 version, allow Ubuntu updates to work
...
Upstream-commit: 8dc2ad2c06fabb6501f0adff80761898bed5bc6f
Component: engine
2013-05-24 17:44:02 +02:00
aa6ea9bb08
bump to master
...
Upstream-commit: 9ebfcc9a152b9e00b166a0d4fb385b61e8330607
Component: engine
2013-05-24 12:17:44 +00:00
95bff3248e
switch to default 127.0.0.1, and mixed the two flags in one. -h
...
Upstream-commit: 13f1939a6316079c14bac5434ecc2c955af1d1fb
Component: engine
2013-05-23 16:09:28 +00:00
149569d0df
Re-ordered and re-titled kernel requirement details to match the shortlist
...
Upstream-commit: dbb7b60cfc97dc1b7a1412775475048b6bf18e67
Component: engine
2013-05-23 09:49:53 -06:00
bda804d554
Simplified and clarified kernel install instructions
...
Upstream-commit: e77263010ce882790f12dfcd0841ea784dab0738
Component: engine
2013-05-23 09:47:20 -06:00
701df1c2f1
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 2cf29893b3b1e6fc526bdf45734f942317598611
Component: engine
2013-05-23 09:33:34 -06:00
349847e8ba
Fixing two typos in the run help
...
Upstream-commit: 9e0427081e80dbf6c7702c8428ec64e40f362804
Component: engine
2013-05-23 18:09:59 +03:00
aad55db6f3
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: bc3675d471d6ca28751c1c8196a6f9bb476557c1
Component: engine
2013-05-23 09:01:40 -06:00
1ac07a6fad
Merge pull request #683 from rogaha/doc_meta_info_update
...
Looks good. Thanks! Closes #637
Upstream-commit: 422edd513a5e1ea30ea65352af213af7856a661e
Component: engine
2013-05-22 19:09:32 -07:00
7040df6614
added/modifed tittle, description and keywords
...
changed the title prefix to sufix + Documentation
Upstream-commit: 18cb5c9314dbc9a0aa857211b124a3feb85c5274
Component: engine
2013-05-22 17:52:48 -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
c981be44f5
improved doc and usage
...
Upstream-commit: 800b401f0ba706f8f09b5beacd335caf4548e63c
Component: engine
2013-05-22 16:15:52 +00:00
6b8b1213b3
Merge pull request #668 from christophercurrie/patch-1
...
- Documentation: Fix typos in the python web app example docs.
Upstream-commit: 1ccc7bdd9083f8970d73a66c86a520dca08b371c
Component: engine
2013-05-22 07:52:46 -07:00
e974a23746
fix content type in doc
...
Upstream-commit: 949a649cc2364f796daae14fa3b044432e25efdf
Component: engine
2013-05-22 13:49:12 +00:00
eb4c932aff
Apparent typos in the docs.
...
Upstream-commit: 5818813183bfb61180846f2b1b23a6fdcb2c9cdd
Component: engine
2013-05-21 21:45:27 -06:00
838989cd24
Update docker builder doc
...
Upstream-commit: 218812eb3cfeb5c5253ed6a54ed3e45c1107ffd1
Component: engine
2013-05-20 17:52:39 -07:00
78fdb08a7e
Install curl; nix stray backslash; use proper IP address
...
Upstream-commit: 3a9ef5f9bbae19ae5ac4108dbbaed649e26d942e
Component: engine
2013-05-20 16:31:39 -07:00
1c04239110
docs/remote_api: remove trunc_cmd from /containers/ps example
...
Apparently, this parameter does not exist anymore.
Upstream-commit: 8291f8b85ca653e13f17ffb126b57bb6b40c1cb5
Component: engine
2013-05-19 11:57:45 -03:00
90b893aa81
Fixed typo in remote API doc
...
Upstream-commit: ea7fdecd41a107d038503578324197780df002a8
Component: engine
2013-05-19 09:37:02 -03:00
8b5995d5c6
Merge pull request #632 from jpetazzo/626-kernel-docs
...
+ Documentation: Added a section for Kernel requirements to the Docker Docs.
Upstream-commit: 66e9f155c3e62bcb681ed302a21d758d09c81d51
Component: engine
2013-05-18 07:53:45 -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
b99a24c471
Add some details about pre-3.8 kernels
...
Upstream-commit: 6301373c68990e8a92730de23a4da86b3442b4ef
Component: engine
2013-05-17 18:58:00 -07:00
d6855e804f
Add information about kernel requirements
...
This page will be helpful for people who:
- want run run a custom kernel
- want to enable memory/swap accounting on Debian/Ubuntu
Upstream-commit: 72360b2cdfcfb70e72295b8f8cf7618257ce8826
Component: engine
2013-05-17 18:57:56 -07:00
b8a2af00ca
add instructions for using docker with puppet
...
Upstream-commit: 55dd0afb5dd365bd306f698f9ccca1425e5c91a7
Component: engine
2013-05-17 17:08:37 +01:00
65f5bcf0ce
1 or 0 -> 1/True/true or 0/False/false
...
Upstream-commit: 0c5443571dd1c081d57b6b2840c30d86bef0e82c
Component: engine
2013-05-16 13:45:29 +00:00
bbf1935467
Merge pull request #620 from dhrp/documentation-review
...
Pulling the installation documentation update. Includes some timely fixes of broken links.
Upstream-commit: 6677c7964a4e50f7db3e8e28edef99c864dfe410
Component: engine
2013-05-15 20:12:09 -07:00
2c21356473
Mostly changes to the html, moved pages, fixed links.
...
* Moved the introduction page to the en/latest/index.html home of the documentation and pointed all links there
* Fixed a broken link from+to homepage
* Fixed the javascript of the documentation navigation to allow expand and collapse multiple times.
* Fixed the one typo Andy pointed out
Upstream-commit: 8454a86e9733b3eddc6dcd5583bef58785a550d7
Component: engine
2013-05-15 20:00:20 -07:00
ab462b220e
Updated getting started on website.
...
Upstream-commit: b5c1b17b50cf7d0fdc9c8894d10bb285d2e755b4
Component: engine
2013-05-15 16:19:18 -07:00
7bd154236e
Clean up of unnecessary files.
...
Upstream-commit: 2ebbd2d6367e9bf83f2ea3f28f7a0f462260913d
Component: engine
2013-05-15 16:13:20 -07:00
