microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
4 114 коммитов 243 Ветки 83 Теги 224 MiB
Граф коммитов

803 Коммитов

Автор SHA1 Сообщение Дата
Daniel Mizyrycki f861c493bf Troubleshooting windows installation section 2013-08-27 11:19:32 -07:00
Andy Rothfusz 5b84252c73 Merge pull request #1622 from TylerBrock/patch-2 
Some fixes for MongoDB example
 2013-08-26 17:28:38 -07:00
Tyler Brock f352ec945f ENTRYPOINT fixups 2013-08-26 19:17:26 -04:00
Andy Rothfusz f7fa6c2b0b Merge pull request #1671 from kim0/patch-3 
Don't force a non-existent npm version, use latest from epel
 2013-08-26 14:33:07 -07:00
kim0 843ef645d2 Don't force a non-existent npm version, use latest from epel 
Not the smartest thing to do
 2013-08-26 12:54:15 +03:00
Tobias Schwab 4440bde0eb Change fetching of gpg key from http to https 
Or was there any reason to fetch using http?
 2013-08-26 11:45:15 +02:00
Andy Rothfusz 820a3b962a Merge pull request #1634 from songgao/patch-1 
Added utils/utils.go : CopyEscapable escale sequence to tutorial.
 2013-08-23 18:52:17 -07:00
Andy Rothfusz dd9ee039a6 Merge pull request #1633 from abhirajbutala/patch-1 
Update docker_remote_api.rst
 2013-08-23 15:17:21 -07:00
Thatcher e2594d162e Merge pull request #1641 from dotcloud/docs-0.6-gpg-key 
Docs 0.6 gpg key
 2013-08-23 13:14:21 -07:00
Thatcher Peskens ebb9b5e85b Added adding the gpg key 2013-08-23 12:56:03 -07:00
Thatcher Peskens 091fb89294 Added line on top of ubuntulinux announcing change in 0.6 
Added lines on top of vagrant installs
 2013-08-23 11:45:52 -07:00
Solomon Hykes 3ebda17f0f Merge pull request #1637 from dhrp/change-docs-ubuntu-sources 
Updated the docs to reflect we no longer use Launchpad and host our own
 2013-08-23 11:05:59 -07:00
Thatcher Peskens f753dfe6b3 Updated the docs to reflect we no longer use Launchpad and host our own repository. 2013-08-23 10:41:53 -07:00
Abhiraj Butala 3396a183c6 Update docker_remote_api.rst 2013-08-23 01:28:58 -07:00
Michael Crosby 551092f9c0 Add lxc-conf flag to allow custom lxc options 2013-08-22 16:05:21 +00:00
Tyler Brock d6f53049c4 Some fixes for MongoDB example 2013-08-21 23:48:32 -04:00
Andy Rothfusz 0b9c8e2860 Merge pull request #1596 from metalivedev/1149-easyfixes 
Fix #1330 and #1149. Improve CMD, ENTRYPOINT, and attach docs.
 2013-08-21 14:06:41 -07:00
Andy Rothfusz 42fe550c9e Merge pull request #1614 from denibertovic/docs 
Small fix to docs regarding adding docker groups
 2013-08-21 12:26:56 -07:00
Andy Rothfusz f5bd137216 Add mongodb example 2013-08-21 12:09:40 -07:00
Andy Rothfusz 348696f3fe Merge pull request #1607 from TylerBrock/mongodb 
Add MongoDB image example
 2013-08-21 12:07:50 -07:00
Michael Crosby 6da071985f Merge pull request #1513 from dotcloud/add_user_dockerfile 
Add USER instruction do Dockerfile
 2013-08-21 09:19:31 -07:00
Michael Crosby e0a7013836 Merge pull request #1576 from MatthewMueller/patch-1 
updated default -H docs
 2013-08-21 09:09:43 -07:00
Deni Bertovic 467dbb75f1 small fix to docs regarding adding docker groups 2013-08-21 17:28:13 +02:00
Tyler Brock 2c147dd721 add mongodb image example 2013-08-20 18:08:15 -04:00
Victor Vieux f69c465231 rebase docs 2013-08-20 11:42:53 +00:00
Andy Rothfusz 75f4fd978d Fix #1330 and #1149. Improve CMD, ENTRYPOINT, and attach docs. 2013-08-19 19:13:26 -07:00
Kyle Conroy e9a1246527 Enable mobile view for website. 
The documentation currently uses responsive Bootstrap, but didn't
include the correct meta tag for proper display on mobile devices.
 2013-08-19 11:54:51 -07:00
Andy Rothfusz d627ff9697 Merge pull request #1590 from elmendalerenda/patch-3 
fixed postgresql conf setting
 2013-08-19 10:27:43 -07:00
elmendalerenda 83acd37161 fixed postgresql conf setting 
small typo, changed listen_address to listen_addresses
 2013-08-19 14:20:25 +01:00
Song Gao b22c973110 Added escape sequence to tutorial 2013-08-18 21:44:46 -05:00
Marco Hennings 319988336c Add workdir support for the Buildfile 
For consistency the Buildfile should have the option to
set the working directory.

Of course that is one option more to the buildfile,
so please tell me if we really want this to happen.
 2013-08-18 20:30:19 +02:00
Marco Hennings 687d27ab57 Add an option to set the working directory. 
This makes it possible to simply wrap a command inside a container. This makes
it easier to use a container as an unified build environment.

Examples:

~/workspace/docker
$ docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu ls
AUTHORS		 Makefile	archive.go	   changes.go	      docker
[...]


docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu pwd
/home/marco/workspace/docker
 2013-08-18 19:34:01 +02:00
Matthew Mueller 5325703c27 updated default 2013-08-17 21:54:10 -07:00
Tyler Brock 674e5c8503 remove extraneous step and stupid whitespace 2013-08-16 13:30:54 -04:00
Tyler Brock 2ec141da54 Add instructions for creating and using the docker group 2013-08-16 13:19:59 -04:00
Andy Rothfusz d4eab77f0c Fix #1517, #1521 by adding sudo to examples and installation. 2013-08-14 16:21:36 -07:00
Michael Crosby 15bc2240ac Merge pull request #1505 from dotcloud/improve_events 
Add image name in /events
 2013-08-14 15:40:36 -07:00
Michael Crosby 9662f9e56a Merge pull request #1478 from jpetazzo/929-insecure-flag 
add -privileged flag and relevant tests, docs, and examples
 2013-08-14 13:55:18 -07:00
Andy Rothfusz 4cb57a5438 Merge pull request #1533 from dhrp/docs-ux-changes 
Docs ux changes
 2013-08-13 18:03:49 -07:00
Andy Rothfusz 2e5642452b Merge pull request #1523 from dotcloud/docker-group-docs 
Update docs for docker group
 2013-08-13 18:02:30 -07:00
Thatcher Peskens 6c87db97a6 Resolved conflict in conf.py 
ps. also changed navigation (swapped community and getting started)
 2013-08-13 16:28:24 -07:00
Thatcher Peskens f127c471a1 Merge remote-tracking branch 'dotcloud/master' into docs-smart-changes 
Conflicts:
	docs/sources/conf.py
 2013-08-13 16:25:58 -07:00
Jérôme Petazzoni 280901e5fb add -insecure flag and relevant tests 2013-08-13 16:20:22 -07:00
Thatcher Peskens f14db49346 [docs] Some user-friendly changes to the documentation. 
- Added parmalinks (closes #1527)
 - Changed the 'fork us on github' button to 'Edit this page on github', so people can edit quickly (closes #1532)
- Changed the favicon
 2013-08-13 16:18:32 -07:00
Andy Rothfusz e2409ad337 Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup. 2013-08-13 13:45:07 -07:00
Michael Crosby e4f35dd4cf Update docs for docker group 2013-08-13 12:05:27 -07:00
Victor Vieux 5ee3c58d25 Add USER instruction 2013-08-13 12:02:17 +00:00
Andy Rothfusz 90cb66f08d Merge pull request #1508 from pborreli/typos 
Fixed typos
 2013-08-12 15:17:02 -07:00
Andy Rothfusz 13acf72a3e Merge pull request #1504 from zaiste/docs/postgresql-service 
docs/postgresql: PostgreSQL service on Docker example
 2013-08-12 14:47:19 -07:00
Pascal Borreli 9b2a5964fc Fixed typos 2013-08-12 18:53:06 +01:00
Michael Crosby 86ef6422f3 Merge pull request #1487 from titanous/maintainer-usernames 
Add GitHub usernames to MAINTAINERS
 2013-08-12 09:07:10 -07:00
Zaiste! 3af60bf375 fix/docs: ubuntu instead of base, note about root-only 2013-08-12 15:30:52 +02:00
Victor Vieux 123c80467b Added docs 2013-08-12 11:55:23 +00:00
Ken Cochrane edba1af304 Merge pull request #1494 from KSid/typo-docs-run-command 
* Documentation: Fix typo in docs for docker run -dns
 2013-08-12 04:51:56 -07:00
Zaiste! d52c149075 docs/postgresql: PostgreSQL service on Docker example 2013-08-12 12:03:43 +02:00
Laurie Voss 529ee848da 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.
 2013-08-11 17:27:47 -07:00
Kawsar Saiyeed a2fb870ce3 Fix typo in docs for docker run -dns 2013-08-11 02:04:04 +01:00
Jonathan Rudenberg 4dc04d7690 Add GitHub usernames to MAINTAINERS 2013-08-09 21:16:44 -04:00
Michael Crosby 28d38620f0 Merge pull request #1417 from crosbymichael/root-socket 
Change daemon to listen on unix socket by default
 2013-08-08 17:06:49 -07:00
Andy Rothfusz 06183e6cdc Merge pull request #1447 from kermit666/image-tag-doc 
doc: syntax to run a specific image tag
 2013-08-07 16:23:45 -07:00
Colin Rice 10190be5d7 Add warning when net.ipv4.ip_forwarding = 0 
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
 2013-08-07 18:28:39 -04:00
Dražen Lučanin 6115348dd9 doc: syntax to run a specific image tag 2013-08-07 13:57:31 +02:00
Andy Rothfusz e0a6f27d1b Suggest installing linux-headers by default. Address #1187 and #1031 2013-08-06 13:56:29 -07:00
Andy Rothfusz 9130ee7513 Merge pull request #1428 from dhrp/twitterhandle 
changed the twitter handle
 2013-08-06 13:38:22 -07:00
Thatcher Peskens 1d654f6156 changed the twitter handle 2013-08-06 11:40:16 -07:00
Michael Crosby 583f5868c9 Move copy command docs to api 1.4 document 2013-08-06 16:09:54 +00:00
Michael Crosby 5b8cfbe15c Add cp command and copy api endpoint 
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.

Closes #382
 2013-08-06 16:09:54 +00:00
Andy Rothfusz 7c03bd1e7a Merge branch 'docs-example-fix' of git://github.com/faizkhan00/docker 
merges #1402
 2013-08-05 18:21:19 -07:00
Michael Crosby 8934f13615 Change daemon to listen on unix socket by default 2013-08-06 00:12:56 +00:00
Andy Rothfusz 7c9604e32b Merge pull request #1387 from joevandyk/patch-1 
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
 2013-08-05 16:14:57 -07:00
Thatcher Peskens ff6b6f2ce1 Fixed some typo's and formatting issues in remote api documentation. 2013-08-05 15:55:40 -07:00
Thatcher d49f141fb3 Merge pull request #1303 from dhrp/update-spinx-for-man 
Enabled the docs to generate manpages.
 2013-08-05 15:31:51 -07:00
Guillaume J. Charmes e54e8fa920 Merge pull request #1290 from dotcloud/parallel_pull 
* Runtime: Parallel pull
 2013-08-05 14:17:29 -07:00
Andy Rothfusz baa4618e57 Merge pull request #1390 from grobie/clarify-amazon-documentation 
Clarify Amazon EC2 installation type
 2013-08-05 13:26:28 -07:00
Andy Rothfusz dcc1e3562f Merge pull request #1404 from dnordberg/fix-base-refs 
'Base' image is depreciated and should no longer be referenced in the docs.
 2013-08-05 13:24:05 -07:00
Victor Vieux 946bbee39a rebase master 2013-08-05 16:25:42 +00:00
Andrew Macgregor ce97a71adf Minor typos found while reading docs 2013-08-05 22:47:16 +08:00
Ken Cochrane a37b42b57c Merge pull request #1400 from gorsuch/doc-typo 
* Documentation: fix a typo in the ubuntu installation guide
 2013-08-05 07:05:27 -07:00
Victor Vieux a97cf23355 add docs 2013-08-05 11:07:27 +00:00
Daniel Nordberg 51d0c9238b 'Base' is depreciated and should no longer be referenced in the docs. 
https://groups.google.com/forum/\#!topic/docker-club/pEjqMgcrnqA
 2013-08-05 01:34:32 +03:00
Faiz K 22df1249b5 bash commands while in the container aren't in the transcript! Added. 2013-08-04 08:26:56 -05:00
Michael Gorsuch db0ccaac9b typo: s/connexions/connections 2013-08-03 22:11:59 -05:00
Tobias Schmidt 708cd34586 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.
 2013-08-03 17:31:20 +07:00
Andy Rothfusz b1d994e3b9 Merge pull request #1375 from grobie/patch-1 
Move note about officially supported kernel
 2013-08-02 17:24:15 -07:00
Joe Van Dyk b6bff0cbb1 Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2 2013-08-02 15:10:57 -07:00
Guillaume J. Charmes ead7eb619e Merge pull request #1384 from crosbymichael/1326-build-without-cache 
* Builder: Add no cache for docker build
 2013-08-02 14:38:34 -07:00
Guillaume J. Charmes 0f088d28c5 Merge pull request #1336 from dotcloud/fix_ADD_permissions 
Builder: Make sure ADD will create everything in 0755
 2013-08-02 13:52:19 -07:00
Andy Rothfusz 09ab2bfa1d Merge pull request #1343 from dotcloud/ufw_doc 
Add ufw doc
 2013-08-02 13:33:26 -07:00
Michael Crosby 3a123bc479 Add no cache for docker build 
Add a new flag to disable the image cache when building images.
 2013-08-02 16:18:54 +00:00
Tobias Schmidt 2424480e2c Move note about officially supported kernel 
It seems this a general note about kernel issues and not specific to Cgroups or namespaces.
 2013-08-02 12:24:38 +07:00
Thatcher ad3b091d53 Some more improvements on the docs readme. Removed references to website. 2013-07-31 13:59:56 -07:00
Thatcher Peskens 26229d78f2 Updated docs README with instructions to preview the generated manfile, and where to get the one generated by sphinx. 2013-07-31 13:44:10 -07:00
Thatcher Peskens e0c24ccfc3 Solved the logo being squished in Safari 2013-07-31 12:17:42 -07:00
Victor Vieux 108635582f rebase master 2013-07-31 15:32:08 +00:00
Victor Vieux 46f59dd933 add parallel pull to 1.4 2013-07-30 12:15:33 +00:00
Victor Vieux 0b57e4483a Merge branch 'master' into 1237-improve_docker_top-feature 2013-07-30 11:51:16 +00:00
Victor Vieux 7d0b8c726c add ufw doc 2013-07-30 13:47:29 +02:00
Victor Vieux f2dc49292f Merge pull request #1342 from dsissitka/patch-4 
Fixed a couple of minor syntax errors.
 2013-07-30 04:20:05 -07:00
dsissitka 9ba998312d Fixed a couple of minor syntax errors. 2013-07-30 01:39:29 -04:00
Thatcher Peskens 5dc86d7bca 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.
 2013-07-29 14:17:15 -07:00
Guillaume J. Charmes f7542664e3
Make sure ADD will create everything in 0755 2013-07-29 11:03:09 -07:00
Solomon Hykes a97d858b2a Clean up 'manifesto' in docs 2013-07-26 10:21:17 -07:00
Victor Vieux 513a567483 fix docs 2013-07-26 10:04:46 +00:00
Thatcher Peskens f4b63d9eea 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.
 2013-07-25 17:19:58 -07:00
Andy Rothfusz 422378cb85 Merge pull request #1274 from dhrp/headings_website 
Removed website and updated headings.
 2013-07-25 16:43:27 -07:00
Guillaume J. Charmes 9cc8b72a38 Merge pull request #1288 from dlintw/1286-improve-import-txz-description 
Fixes #1286 improve-import-txz-description
 2013-07-25 12:37:37 -07:00
Daniel YC Lin 8f6b6d5784 Fixes #1286 2013-07-25 15:36:32 +08:00
Victor Vieux 6057e6ad70 add kernel version 2013-07-24 13:36:55 +00:00
Victor Vieux ee05f97c9a Merge branch 'master' into 1167_events_endpoint-feature 2013-07-24 11:49:04 +00:00
Thatcher Peskens e701dce339 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/
 2013-07-23 13:05:06 -07:00
Victor Vieux a93a87f64a Merge branch 'stfp-858-disable-network-configuration' 2013-07-23 19:55:50 +00:00
Victor Vieux dfc64d157a Merge pull request #1241 from ryfow/patch-1 
Make the ENTRYPOINT example work
 2013-07-23 08:45:04 -07:00
Victor Vieux ec559c02b8 add docs 2013-07-23 15:42:34 +00:00
Victor Vieux 8165e51ecc Merge branch '858-disable-network-configuration' of https://github.com/stfp/docker into stfp-858-disable-network-configuration 2013-07-23 08:44:12 +00:00
Thatcher Peskens 58a1c5720a Added new docker logo to the documentation header, and added other links. 2013-07-22 20:26:40 -07:00
Victor Vieux c81662eae4 Merge branch 'master' into 1237-improve_docker_top-feature 
Conflicts:
	docs/sources/api/docker_remote_api.rst
 2013-07-22 16:22:11 +00:00
Victor Vieux 4e7f2b757e Merge pull request #1158 from cespare/1142-docker-add-fix 
*Buildfile: determine a filename from a URL if the destination is a directory
 2013-07-22 07:07:04 -07:00
Ken Cochrane 2bba279cf1 Merge pull request #1259 from dsissitka/patch-3 
*Documentation: Updated the stop command's docs.
 2013-07-22 06:59:02 -07:00
Ken Cochrane 56da77a548 Merge pull request #1258 from dsissitka/patch-2 
* Documentation: Added top to the list of commands in the sidebar.
 2013-07-22 06:58:09 -07:00
Caleb Spare c383d59880 Update ADD documentation to specify new behavior. 2013-07-21 23:32:06 -07:00
Caleb Spare 416fdaa3d5 Remove some trailing whitespace. 2013-07-21 23:32:06 -07:00
Stefan Praszalowicz 3342bdb331 Support networkless containers with new docker run option '-n' 2013-07-21 17:11:47 -07:00
David Sissitka 1d02a7ffb6 Updated the stop command's docs. 2013-07-21 19:00:18 -04:00
dsissitka 788935175e Added top to the list of commands in the sidebar. 2013-07-21 18:30:51 -04:00
dsissitka 32663bf431 Fixed a couple of minor syntax errors. 2013-07-20 21:27:55 -04:00
Andy Rothfusz 23ea9b8968 Merge pull request #1235 from metalivedev/cleandocbld 
Make docs build without warnings or errors. Minor additional cleanup.
 2013-07-19 09:44:53 -07:00
Ryan Fowler e8ad82f9ba Make the ENTRYPOINT example work 
The incantation listed in the ENTRYPOINT example didn't actually pass the arguments to your script. Changing the definition to an array fixes this.
 2013-07-19 10:11:21 -05:00
unclejack 2a3b91e3b6 docs - add example for cidfile 2013-07-19 16:03:45 +03:00
unclejack 221ee504aa docs - add cidfile flag to run docs 2013-07-19 16:03:45 +03:00
Victor Vieux eb4a0271fb bump api version to 1.4 2013-07-19 10:34:55 +00:00
Andy Rothfusz 54f9cdb0c3 Make docs build without warnings or errors. Minor additional cleanup. 2013-07-18 19:04:51 -07:00
Andy Rothfusz aa5671411b Make dockerfile docs easier to find. Clean up formatting. 2013-07-17 18:56:40 -07:00
Andy Rothfusz 3dbf9c6560 Merge pull request #1219 from metalivedev/docs-repoupdate 
Update docs with 0.5 repository information.
 2013-07-17 13:53:12 -07:00
Guillaume J. Charmes de563a3ea3 Merge pull request #1194 from crosbymichael/build-verbose 
* Builder: Add verbose output to docker build
 2013-07-17 12:53:06 -07:00
Victor Vieux 9cf2b41c05 change rm usage in docs 2013-07-17 19:24:54 +00:00
Victor Vieux f310b875f8 Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master 2013-07-17 19:23:06 +00:00
Andy Rothfusz 0356081c0a Update repository information. 2013-07-16 17:04:41 -07:00
Guillaume J. Charmes 18e91d5f85
Update docs 2013-07-16 10:14:21 -07:00
Ken Cochrane 364f48d6c7 updated the rmi command docs, the had typos 2013-07-12 14:05:26 -04:00
Michael Crosby d0c73c28df Add param to api docs for verbose build output 2013-07-12 06:22:56 -09:00
Victor Vieux 8e6c249e48 Merge pull request #1197 from crosbymichael/buildfile-doc-ordering 
Fix Docker Builder documentation section numbers
 2013-07-12 05:27:47 -07:00
Victor Vieux 752f99e8a1 Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature 
* Client: Add options to docker login to be able to use it via script
 2013-07-12 05:07:25 -07:00
Victor Vieux 9232d1ef62 Merge branch 'master' into list_container_processes-feature 2013-07-12 11:47:27 +00:00
Michael Crosby 90483dc912 Fix Docker Builder documentation numbering 2013-07-11 16:41:19 -09:00
Michael Crosby 474191dd7b Add verbose output to docker build 
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
 2013-07-11 15:27:33 -09:00
Guillaume J. Charmes 637eceb6a7 Merge pull request #1124 from crosbymichael/buildfile-volumes 
+ Builder: Add VOLUME instruction to buildfile
 2013-07-11 17:16:57 -07:00
Victor Vieux fc3a8e409d change tag -> repo name in build usage 2013-07-10 22:44:31 +00:00
Michael Crosby eb9fef2c42 Add VOLUME instruction to buildfile 2013-07-10 06:59:16 -09:00
Solomon Hykes a839b36e55 Fix outdated docs explaining how to setup a dev environment. Building docker with docker ftw 2013-07-09 16:48:16 -07:00
Andy Rothfusz 11998ae7d6 Fix installation link from welcome page. 2013-07-02 16:48:57 -07:00
Andy Rothfusz 96ab3c540d Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627 
Conflicts:
	docs/sources/concepts/manifesto.rst
	docs/sources/index.rst
 2013-07-02 15:10:07 -07:00
Andy Rothfusz ff964d327d Cleaning up the welcome page, terminology, and images. 2013-07-02 15:03:29 -07:00
Andy Rothfusz 4b8688f1e5 Fix broken quickstart link 2013-07-02 14:10:06 -07:00
Andy Rothfusz 55b5889a0f Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627 
Conflicts:
	docs/sources/concepts/manifesto.rst
 2013-07-02 13:00:08 -07:00
Andy Rothfusz dd4c6f6a09 Shortened lines to 80 columns 2013-07-02 12:09:57 -07:00
Andy Rothfusz 6058261a26 Clean up image text, minor updates to docs. 2013-07-02 12:09:57 -07:00
Andy Rothfusz b461e4607d Adding files for terms 2013-07-02 12:09:57 -07:00
Andy Rothfusz d399f72098 Cleaning up the welcome page, terminology. 2013-07-02 12:09:57 -07:00
Andy Rothfusz b47873c5ac Clean up image text, minor updates to docs. 2013-07-01 16:37:13 -07:00
Andy Rothfusz adf75d402a Adding files for terms 2013-07-01 16:37:13 -07:00
Andy Rothfusz cb1fdb2f03 Cleaning up the welcome page, terminology. 2013-07-01 16:37:13 -07:00
Guillaume J. Charmes 185a2fc55e Merge pull request #1086 from crosbymichael/1008-image-entrypoint 
+ Builder: Add Entrypoint to builder and container config
 2013-07-01 13:33:12 -07:00
zettaset-kpelykh aa9bec96b1 Issue #1087 Docker Java API client -- added java to Docker Remote API Client document 2013-07-01 11:28:40 -07:00
Victor Vieux 11e28842ac change to top 2013-07-01 15:19:42 +00:00
Michael Crosby b16ff9f859 Add Entrypoint to builder and container config 
By setting an entrypoint in the Dockerfile this
allows one to run an image and only pass arguments.
 2013-07-01 05:34:27 -09:00
Victor Vieux 8dcc6a0280 fix status code in doc 2013-07-01 13:28:58 +00:00
Victor Vieux 3b5ad44647 rebase master 2013-07-01 12:31:16 +00:00
Victor Vieux 8589fd6db8 Add doc 2013-06-28 18:05:41 +02:00
Thatcher e12a204bcc Merge pull request #1028 from dhrp/bugfixes-on-docs 
Bugfixes on documentation code
 2013-06-27 19:01:13 -07:00
Gabriel Monroy 4fdf11b2e6 + Runtime: mount volumes from a host directory with 'docker run -b' 2013-06-26 15:07:31 -07:00
Thatcher Peskens 73afc6311d Bugfixes on docs 
* fixed canonical link from index
* added http redirect from builder/basics
* fixed url in redirect_home
 2013-06-25 15:31:22 -07:00
Tom Hulihan d03edf12e4 Added Swipely's `docker-api` gem to the table of Remote API Client 
Libraries.
 2013-06-25 08:26:41 -04:00
Ken Cochrane e2516c01b4 Merge pull request #932 from metalivedev/docs20130614 
+ Documentation: Add terminology section
 2013-06-24 10:39:25 -07:00
Victor Vieux 4d1692726b merge master and add doc 2013-06-22 01:08:20 +02:00
Guillaume J. Charmes de1a5a75cc Merge pull request #848 from dotcloud/builder_server-3 
Improve Docker build
 2013-06-21 14:55:08 -07:00
Guillaume J. Charmes 169ef21de7 Remove deprecated INSERT from documentation 2013-06-21 14:12:52 -07:00
Guillaume J. Charmes d0fa6927f8 Update api docs 2013-06-21 13:51:48 -07:00
Guillaume J. Charmes 070e1aec7e Merge pull request #975 from unclejack/891-mark_command_as_optional 
891 mark command as optional for docker run
 2013-06-21 10:22:52 -07:00
Victor Vieux 42bcfcc927 add options to docker login 2013-06-21 10:00:25 +00:00
Victor Vieux 8f2a80804c Merge branch 'master' into fix-auth 2013-06-21 09:18:03 +00:00
Victor Vieux 8e7d4cda07 fix doc post 2013-06-21 11:13:13 +02:00
unclejack 6a1279fb90 docs: mark command as optional for docker run 2013-06-21 11:07:14 +03:00
Solomon Hykes 352991bdf4 Merge branch 'simpler-build-upload' (#900) into builder_server-3 (#848) 2013-06-20 22:02:36 -07:00
Solomon Hykes 4383d7b603 Merge pull request #953 from rhysh/952-swapaccount-docs 
- Documentation: fix inconsistent/outdated instructions for setting up "swapaccount"
 2013-06-20 20:49:44 -07:00
Solomon Hykes e43323221b Merge branch 'master' into simpler-build-upload 
Conflicts:
	api.go
	builder_client.go
	commands.go
 2013-06-20 14:19:09 -07:00
Solomon Hykes cff2187a4c Fixed API version numbers in api docs 2013-06-20 12:30:02 -07:00
Guillaume J. Charmes fa68fe6ff3 Merge pull request #938 from dotcloud/add_unix_socket-feature 
* Runtime: Add unix socket and multiple -H
 2013-06-20 11:17:16 -07:00
Guillaume J. Charmes 659e846006 Merge branch 'master' into builder_server-3 
Conflicts:
	docs/sources/use/builder.rst
 2013-06-20 10:27:12 -07:00
Victor Vieux 05796bed57 update docs 2013-06-20 12:34:08 +00:00
Solomon Hykes 79efcb545d Merge branch 'master' into simpler-build-upload 2013-06-19 18:48:19 -07:00
Solomon Hykes d6ab71f450 * Remote API: updated docs for 1.3 2013-06-19 15:03:33 -07:00
Rhys Hiltner 5fc1329b2f the kernel needs "swapaccount=1" set - some docs are updated, this one seems to have slipped through 
Fixes #952
 2013-06-19 14:45:03 -07:00
Solomon Hykes 507ea757a5 * Builder: correct the behavior of ADD when copying directories. 2013-06-19 14:26:11 -07:00
Solomon Hykes a056f1deec Merge pull request #924 from eliasp/remove-ifconfig-usage 
* Documentation: replace `ifconfig` in docs with `iproute`
 2013-06-19 13:20:35 -07:00
Solomon Hykes b368d21568 Merge branch 'master' into fix-add-behavior 2013-06-19 10:31:50 -07:00
Victor Vieux d52af3f58f Merge branch 'master' into add_unix_socket-feature 2013-06-19 12:49:27 +00:00
Victor Vieux 063c838c92 update docs 2013-06-19 12:48:50 +00:00
Solomon Hykes 5be7b9af3e * Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented. 2013-06-18 20:28:49 -07:00
Andy Rothfusz 5183399f50 Added multilayer example image. 2013-06-18 19:31:35 -07:00
Andy Rothfusz a780b7c6b5 New Terminology section and illustrations. 2013-06-18 19:31:35 -07:00
Guillaume J. Charmes ee5df76579 Merge pull request #885 from dotcloud/remove_bsdtar 
* Runtime: Remove bsdtar dependency
 2013-06-18 17:24:26 -07:00
Guillaume J. Charmes 34a434616a Merge branch 'master' into builder_server-3 
Conflicts:
	buildfile.go
 2013-06-18 16:12:30 -07:00
Elias Probst bc9b91e501 Use the canonical 'ip' commands to make it easier for new 'iproute2' users to understand the usage. 2013-06-19 00:57:43 +02:00
Solomon Hykes edbd3da33a Merge pull request #927 from dotcloud/nicer-build-output 
* Builder: nicer output for 'docker build'
 2013-06-18 15:48:00 -07:00
Guillaume J. Charmes 32e8f9beca Merge pull request #918 from dotcloud/hisotry_lookup 
Add image lookup to history command
 2013-06-18 15:36:05 -07:00
Guillaume J. Charmes 84ceeaa870 Update documentaiton 2013-06-18 14:36:35 -07:00
Solomon Hykes c0b82bd807 Fix incorrect docs for 'docker build' 2013-06-18 12:52:37 -07:00
Guillaume J. Charmes 6e17cc45ea Fix merge issue 2013-06-18 12:33:06 -07:00
Elias Probst c2e95997d4 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. 2013-06-18 19:55:59 +02:00
Guillaume J. Charmes 808faa6371 * API: Send all tags on History API call 2013-06-18 10:31:07 -07:00
Andy Rothfusz 702c3538a4 Merge pull request #921 from dhrp/docs-redirects-and-fixes 
Fixes on documentation. LGTM
 2013-06-18 09:58:24 -07:00
Thatcher Peskens 3491d7d2f1 Fixed on documentation. 
* replaced previously removed concepts/containers and concepts/introcution by a redirect
* moved orphan index/varable to workingwiththerepository
* added favicon to the layout.html
* added redirect_home which is a http refresh redirect. It works like a 301 for google
* fixed an issue in the layout that would make it break when on small screens
 2013-06-17 20:16:56 -07:00
Guillaume J. Charmes 02a002d264 Update documentation 2013-06-17 18:41:13 -07:00
Guillaume J. Charmes 555552340d Merge branch 'master' into builder_server-3 
Conflicts:
	buildfile_test.go
 2013-06-17 14:01:32 -07:00
Solomon Hykes 6e2c32eb9a Merge pull request #911 from dotcloud/add_port_redirection_doc 
* Documentation: add port redirection doc
 2013-06-17 13:57:08 -07:00
Solomon Hykes cb58e63fc5 Typo 2013-06-17 14:28:04 -06:00
Solomon Hykes 8626598753 Added content to port redirect doc 2013-06-17 13:25:50 -07:00
Victor Vieux 36231345f1 add port redirection doc 2013-06-17 22:05:58 +02:00
Guillaume J. Charmes 78f86ea502 Merge branch 'master' into builder_server-3 
Conflicts:
	utils/utils.go
 2013-06-14 17:08:39 -07:00
Guillaume J. Charmes abf85b2508 Merge branch 'master' into remove_bsdtar 
Conflicts:
	docs/sources/contributing/devenvironment.rst
 2013-06-14 14:34:30 -07:00
Andy Rothfusz 7958f1f694 Add examples for local import. 2013-06-14 13:42:59 -06:00
Guillaume J. Charmes 4a02c6dab1 Merge pull request #816 from unclejack/524-fix_aufs_links_related_warnings 
524 fix aufs links related warnings
 2013-06-14 12:32:47 -07:00
unclejack fb7eaf67d1 add aufs-tools package to dev env docs page 2013-06-14 21:41:12 +03:00
Guillaume J. Charmes 79fe864d9a Update docs 2013-06-14 10:58:16 -07:00
Victor Vieux 90f6bdd6e4 update docs, remove config file on 401 2013-06-14 13:38:51 +00:00
Victor Vieux e49f82b9e1 update docs 2013-06-14 10:10:26 +00:00
Guillaume J. Charmes 4b4918f2a7 Merge branch 'master' into builder_server-3 
Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
 2013-06-13 18:11:22 -07:00
Victor Vieux c46382ba29 rebase master 2013-06-13 17:58:06 +00:00
Solomon Hykes 5ecfe13be9 Merge branch '610-improve_rmi-feature' 
* Runtime: improved image removal to garbage-collect unreferenced parents
- Runtime: fixed image removal to cleanly remove tags and repositories
 2013-06-12 20:30:07 -07:00
Andy Rothfusz 48897b5fa1 Merge pull request #845 from unclejack/841-update_docs_no_add_without_context 
841 - docs: warn about the transmission of data to the docker daemon & ADD without context
 2013-06-12 14:25:44 -07:00
Victor Vieux f2383151cb bump to master 2013-06-12 17:39:32 +00:00
Solomon Hykes b4565af256 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-06-12 10:23:14 -07:00
Solomon Hykes 092c761cec Merge pull request #853 from kencochrane/registry-api-1.1-fix 
* Documentation: separate the registry and index API's into their own docs
 2013-06-11 18:34:10 -07:00
Solomon Hykes d64f105b44 Added a readme explaining the role of each API 2013-06-11 10:39:02 -07:00
Victor Vieux 20bf0e00e8 * Remote Api: Add flag to enable cross domain requests 2013-06-11 10:12:36 +00:00
Andy Rothfusz ca4597e9d7 Add links to libraries, fix #800 2013-06-10 15:22:34 -07:00
Andy Rothfusz eeea9ac946 Add list of Docker Remote API Client Libraries. Fixes #800. 2013-06-10 15:17:27 -07:00
Victor Vieux bcc4754dc1 Merge pull request #869 from fsouza/fix-api-docs 
docs/api/remote: fix rst syntax in the "Search images" section
 2013-06-10 14:21:39 -07:00
Victor Vieux 66d9a73362 rebump 2013-06-10 21:05:54 +00:00
Andy Rothfusz 5712e37437 Merge pull request #840 from dhrp/just-fixed-some-links 
Fixed some links. Closes #839 #838 #835
 2013-06-10 13:51:43 -07:00
Francisco Souza b1ed75078e docs/api/remote: fix rst syntax in the "Search images" section 2013-06-10 16:07:57 -03:00
Guillaume J. Charmes 8984aef899 Fix typo in docs 2013-06-10 09:32:31 -07:00
Guillaume J. Charmes 956491f853 Merge pull request #855 from samjsharpe/fix_missing_hyphen 
Build from Dockerfile on stdin requires a hyphen
 2013-06-07 13:04:27 -07:00
Sam J Sharpe 5e6cd21f8b Build from Dockerfile on stdin requires a hypen 
There is a missing hypen in the documentation:
    `docker build < Dockerfile` will complain
    `docker build - < Dockerfile` will not complain
 2013-06-07 20:35:34 +01:00
Ken Cochrane 9e1cd37bbc seperated the registry and index API's into their own docs 
seperated the registry and index API's into their own docs and merged
in the index search api into the index api. Also renamed the original
registry api to registry_index_spec.
 2013-06-07 13:42:52 -04:00
Guillaume J. Charmes 2cc22de696 Update documentation for docker build 2013-06-06 16:48:36 -07:00
unclejack 4b3a381f39 docs: build: ADD copies just needed data w/ full path 2013-06-07 00:39:43 +03:00
unclejack efa7ea592c docs: warn about build data tx & ADD w/o context 
This updates the documentation to mention that:
1. a lot of data may get sent to the docker daemon if there is a lot of
data in the directory passed to docker build
2. ADD doesn't work in the absence of the context
3. running without a context doesn't send file data to the docker
daemon
4. explain that the data sent to the docker daemon will be used by ADD
commands
 2013-06-06 22:06:12 +03:00
Daniel Mizyrycki 1cc4049e82 Merge pull request #827 from dotcloud/dev_environment_update 
Update "Setting Up a Dev Environment" doc, with modern golang  PPA and stable lxc kernel
 2013-06-06 09:48:19 -07:00
Victor Vieux a118ad90ed changed to 12.04 and add kernel 2013-06-06 12:36:28 +00:00
Thatcher Peskens 0f23fb949d Fixed some links 
* Added Google group to FAQ on docs
* Changed IRC link
* Fixed link to contributing broken by 326faec
 2013-06-05 18:06:51 -07:00
Thatcher f1992eeea5 Merge pull request #817 from dhrp/blog-in-navigation 
Modified the navigation in both website and documentaion to include the blog.
 2013-06-05 17:28:19 -07:00
Victor Vieux ce0041832c bump to master 2013-06-05 15:30:45 +00:00
Victor Vieux e3cc625315 update doc to newer go 2013-06-05 13:19:49 +00:00
Victor Vieux 6255112926 updated doc 2013-06-05 13:19:57 +02:00
Victor Vieux c906239220 bump to master 2013-06-05 10:23:45 +00:00
Victor Vieux b4682e6707 bump to master 2013-06-05 10:19:51 +00:00
John Costa c000ef194c Remove provider specifc language 2013-06-04 16:01:38 -04:00
Ken Cochrane 479ac9afa7 Merge pull request #802 from johncosta/ubuntu-1304-add-apt-repository 
- Documentation: adding missing dependency to the ubuntu linux install page.
 2013-06-04 11:55:34 -07:00
Thatcher Peskens 716892b95d Modified the navigation in both website and documentaion to include the Blog. 2013-06-04 11:41:54 -07:00
Victor Vieux 3922691fb9 fix progress message in client 2013-06-04 16:09:08 +00:00
John Costa e61af8bc62 some installations of ubuntu 13.04 (digital ocean Ubuntu 13.04 x64 Server in this case) require software-properties-common to be installed before being able to use add-apt-repository 2013-06-04 10:40:44 -04:00
Michael Crosby 6d5bdff394 Add flag to enable cross domain requests in Api 
Add the -api-enable-cors flag when running docker
in daemon mode to allow CORS requests to be made to
the Remote Api.  The default value is false for this
flag to not allow cross origin request to be made.

Also added a handler for OPTIONS requests the standard
for cross domain requests is to initially make an
OPTIONS request to the api.
 2013-06-03 21:39:00 -04:00
Thatcher Peskens 38f29f7d0c Changed some text on the website to include docker-club 
Fixed a link in the FAQ on the docs
Fixed a detail in the Makefile for pushing the site to dotcloud
 2013-06-03 11:45:19 -07:00
Victor Vieux 7e59b83053 removed auth in pull 2013-06-03 17:51:52 +00:00
Guillaume J. Charmes 0443cc351d Merge pull request #772 from dotcloud/improve_version_info_cmds 
* API: Improve version info cmds
 2013-06-03 06:36:09 -07:00
Victor Vieux ca902b6be4 bump master 2013-06-03 12:37:51 +00:00
Victor Vieux 3dd1e4d58c added docs and moved to api version 1.2 2013-06-03 12:09:16 +00:00
Solomon Hykes cebfde9ea5 Merge pull request #787 from gasi/nodejs-centos-docs 
* Documentation: Deploying a Node.js Web App on CentOS
* Documentation: small formatting improvements
 2013-06-02 23:27:29 -07:00
Daniel Gasienica 82dadc2005 Document installation of npm dependencies /ht @grigio 2013-06-02 20:10:22 -07:00
Daniel Gasienica 464765b940 Add link at the beginning 2013-06-01 22:16:26 -07:00
Daniel Gasienica e9ffc1e499 Add Node.js web app example using CentOS 2013-06-01 22:06:53 -07:00
Daniel Gasienica 4fb9a6eafb Use code blocks 2013-06-01 22:03:41 -07:00
Daniel Gasienica 157547845a Name examples consistently 2013-06-01 22:03:28 -07:00
Daniel Gasienica 2935ca7ee2 Use title case for consistency 2013-06-01 22:03:12 -07:00
Daniel Gasienica 23452f1573 Use em dash in title 2013-06-01 22:02:24 -07:00
Daniel Gasienica f6f345b1fe Fix typo 2013-06-01 21:55:01 -07:00
Daniel Gasienica e3fd61ad74 Add more tags 2013-06-01 21:27:27 -07:00
Daniel Gasienica 01ce63aacd Make style consistent 2013-06-01 21:26:58 -07:00
Daniel Gasienica 3ca9c11110 Add Mac OS X instructions for doc tools 2013-06-01 21:26:18 -07:00
Daniel Gasienica b4df0b17af Add `make server` command to preview docs 2013-06-01 21:25:51 -07:00
Jon Wedaman 7f65bf508e Spelling correction in docs 2013-06-01 21:48:32 -04:00
Guillaume J. Charmes 9bc71c101c Merge pull request #719 from dotcloud/json_stream-feature 
* API: push, pull, import, insert -> Json Stream
 2013-05-31 16:05:15 -07:00
Guillaume J. Charmes f41d2ec4d9 Update api docs 2013-05-31 15:56:30 -07:00
Guillaume J. Charmes 7d167590bc Merge pull request #766 from dotcloud/prevent_attach_stopped_container-feature 
returns an error if the container we want to attach is not running
 2013-05-31 14:41:57 -07:00
Solomon Hykes 76bb920449 Merge pull request #753 from dotcloud/registry_api_remove_teams 
Remove teams from the registry API
 2013-05-31 12:41:12 -07:00
Daniel Gasienica fd0c501e6d Fix minor documentation error in ‘Running Redis Service’ example 2013-05-31 12:19:49 -07:00
Victor Vieux 468e4c4b56 returns an error if the container we want to attach is not running 2013-05-31 15:34:23 +00:00
Victor Vieux 2baea24879 add -t parameter in the doc 2013-05-31 14:40:09 +00:00
Victor Vieux 9060b5c2f5 added proper returns type, move the auto-prune in v1.1 api 2013-05-31 14:37:02 +00:00
Andy Rothfusz 1c091657d4 Merge pull request #745 from rogaha/doc_ssh_service_example_uptd 
Add screencast summary. Makes it easy to reproduce steps.
 2013-05-30 18:49:32 -07:00
Solomon Hykes 4205b6bb1d Merge branch 'master' into builder_server-2 2013-05-30 14:09:42 -07:00
Guillaume J. Charmes 28d5b2c15a Update docker build docs 2013-05-30 12:35:19 -07:00
Solomon Hykes 5324614410 Merge pull request #747 from riccieri/patch-1 
+ * Documentation: add IP forwarding config to archlinux guide
 2013-05-30 11:59:53 -07:00
Solomon Hykes 531b30119a Remove special case for 'teams' from registry api 2013-05-30 11:37:58 -07:00
Solomon Hykes 2ed1092dad * Documentation: removed 'building blocks' for now. 2013-05-30 11:26:47 -07:00
Renato Riccieri Santos Zannon b2084a9c59 Add IP forwarding config to archlinux guide 
I had this small issue when following this guide on my Arch box, and I don't think it is specific to any configuration I have.
 2013-05-30 01:56:08 -03:00
Guillaume J. Charmes 92939569ab Update build doc 2013-05-29 11:53:44 -07:00
Guillaume J. Charmes d97fff60a9 Update docker build docs 2013-05-29 11:50:49 -07:00
Roberto Gandolfo Hashioka c7af917d13 updated the running ssh service example with the video's transcription 2013-05-29 11:29:30 -07:00
Victor Vieux f339fc2eb9 bump to master 2013-05-29 13:52:18 +00:00
Victor Vieux ea9095c562 merge master 2013-05-29 11:49:39 +00:00
Solomon Hykes 83db1f36e3 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-28 19:39:20 -07:00
Solomon Hykes 24ddfe3f25 Documented who decides what and how. 2013-05-28 19:39:09 -07:00
Guillaume J. Charmes f65327555e Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature 
* API: rename containers/ps to containers/json
 2013-05-28 15:44:20 -07:00
Solomon Hykes 522f399d68 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-28 14:57:50 -07:00
Solomon Hykes 326faec664 De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo. 2013-05-28 14:57:36 -07:00
Thatcher 28a30eda88 Merge pull request #702 from kim0/patch-2 
Properly install ppa, avoid GPG key warning. Also closes #715
 2013-05-28 14:17:59 -07:00
Thatcher f3cc1d985e Merge pull request #733 from meejah/master 
Documentation: Use add-apt-repository instead of editing sources.list
 2013-05-28 13:55:11 -07:00
Andy Rothfusz 235ae9cd43 Merge pull request #709 from dhrp/links-to-kernel-doc 
Added links to @jpetazzo 's kernel article, cleaned puppet doc layout
 2013-05-28 12:07:46 -07:00
meejah 444f7020cb Add sudo to commands. 2013-05-28 10:56:26 -06:00
meejah 525080100d Use Ubuntu's built-in method to add a PPA repository, which correctly handles keys for you. 2013-05-28 10:54:32 -06:00
Victor Vieux 4f9443927e rename containers/ps to containers/json 2013-05-28 16:08:05 +00:00
Victor Vieux 8699805756 documentation 2013-05-28 15:49:57 +00:00
Mark McGranaghan 7d6ff7be12 Fix attach API docs. 2013-05-28 06:27:12 -07:00
Guillaume J. Charmes d3b9733507 Merge pull request #657 from offby1/master 
Minor tweaks to python_web_app.rst
 2013-05-24 19:19:32 -07:00
Solomon Hykes df23a1e675 * Registry: specified naming restrictions for usernames and repository names 2013-05-24 18:58:24 -07:00
Thatcher Peskens c5f15dcd3d Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst 2013-05-24 14:42:00 -07:00
Victor Vieux d7b01c049d bump to master 2013-05-24 16:50:16 +00:00
Victor Vieux 92e4a51965 use -H 2013-05-24 16:49:18 +00:00
kim0 4e576f047f Properly install ppa, avoid GPG key warning 2013-05-24 18:55:32 +03:00
kim0 8dc2ad2c06 Avoid hardcoding kernel 3.8 version, allow Ubuntu updates to work 2013-05-24 17:44:02 +02:00
Victor Vieux 9ebfcc9a15 bump to master 2013-05-24 12:17:44 +00:00
Victor Vieux 13f1939a63 switch to default 127.0.0.1, and mixed the two flags in one. -h 2013-05-23 16:09:28 +00:00
Solomon Hykes dbb7b60cfc Re-ordered and re-titled kernel requirement details to match the shortlist 2013-05-23 09:49:53 -06:00
Solomon Hykes e77263010c Simplified and clarified kernel install instructions 2013-05-23 09:47:20 -06:00
Solomon Hykes 2cf29893b3 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-23 09:33:34 -06:00
Andreas Tiefenthaler 9e0427081e Fixing two typos in the run help 2013-05-23 18:09:59 +03:00
Solomon Hykes bc3675d471 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-23 09:01:40 -06:00
Thatcher 422edd513a Merge pull request #683 from rogaha/doc_meta_info_update 
Looks good. Thanks!  Closes #637
 2013-05-22 19:09:32 -07:00
rogaha 18cb5c9314 added/modifed tittle, description and keywords 
changed the title prefix to sufix + Documentation
 2013-05-22 17:52:48 -07:00
Eric Hanchrow 056698b676 Use 127.0.0.1 instead of `hostname` in the "access the web app" section. 2013-05-22 12:54:50 -07:00
Eric Hanchrow b4198de6bf Merge remote-tracking branch 'upstream/master' 
Conflicts:
	docs/sources/examples/python_web_app.rst
 2013-05-22 12:52:14 -07:00
Victor Vieux 800b401f0b improved doc and usage 2013-05-22 16:15:52 +00:00
Ken Cochrane 1ccc7bdd90 Merge pull request #668 from christophercurrie/patch-1 
- Documentation: Fix typos in the python web app example docs.
 2013-05-22 07:52:46 -07:00
Victor Vieux 949a649cc2 fix content type in doc 2013-05-22 13:49:12 +00:00
Christopher Currie 5818813183 Apparent typos in the docs. 2013-05-21 21:45:27 -06:00
Guillaume J. Charmes 218812eb3c Update docker builder doc 2013-05-20 17:52:39 -07:00
Eric Hanchrow 3a9ef5f9bb Install curl; nix stray backslash; use proper IP address 2013-05-20 16:31:39 -07:00
Victor Vieux 67b20f2c8c add check to see if the image isn't parent of another and add -f to force 2013-05-20 18:31:45 +00:00
Francisco Souza 8291f8b85c docs/remote_api: remove trunc_cmd from /containers/ps example 
Apparently, this parameter does not exist anymore.
 2013-05-19 11:57:45 -03:00
Phil Spitler ea7fdecd41 Fixed typo in remote API doc 2013-05-19 09:37:02 -03:00
Ken Cochrane 66e9f155c3 Merge pull request #632 from jpetazzo/626-kernel-docs 
+ Documentation: Added a section for Kernel requirements to the Docker Docs.
 2013-05-18 07:53:45 -07:00
Thatcher Peskens 537cce16f2 Added a "we are hiring" to the frontpage of the docker website, and fixed two broken links in the docs. 2013-05-17 19:35:46 -07:00
Jérôme Petazzoni 6301373c68 Add some details about pre-3.8 kernels 2013-05-17 18:58:00 -07:00
Jérôme Petazzoni 72360b2cdf 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
 2013-05-17 18:57:56 -07:00
Gareth Rushgrove 55dd0afb5d add instructions for using docker with puppet 2013-05-17 17:08:37 +01:00
Victor Vieux 0c5443571d 1 or 0 -> 1/True/true or 0/False/false 2013-05-16 13:45:29 +00:00
Thatcher 6677c7964a Merge pull request #620 from dhrp/documentation-review 
Pulling the installation documentation update. Includes some timely fixes of broken links.
 2013-05-15 20:12:09 -07:00
Thatcher Peskens 8454a86e97 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
 2013-05-15 20:00:20 -07:00