Solomon Hykes
70853785b6
Merge remote-tracking branch 'shawnsi/iptables-wrapper'
2013-03-28 18:40:02 -07:00
Solomon Hykes
12a65dc4a8
Merge remote-tracking branch 'titanous/camelize'
2013-03-28 18:23:59 -07:00
Solomon Hykes
b67fe1ecb9
Merge pull request #246 from titanous/update-authors
...
Update AUTHORS and add .mailmap
2013-03-28 18:19:05 -07:00
Jonathan Rudenberg
6bcc55f7d0
Update AUTHORS and add .mailmap
2013-03-28 20:53:54 -04:00
Jonathan Rudenberg
a6da7f138c
Camelize some snake_case variable names
2013-03-28 20:12:23 -04:00
Julien Barbier
d66de319bd
Docs: Changed the url of the LEGO img to point to the one with copyright
2013-03-28 17:09:36 -07:00
John Costa
760736b3f3
add contributing guidlines md file
2013-03-28 20:04:21 -04:00
Solomon Hykes
0636c11f0b
Merge remote-tracking branch 'origin/165-push_permission_check-fix'
2013-03-28 15:45:00 -07:00
Jonathan Rudenberg
5dc1e66366
Remove unneeded sqlite deps from puppet and debian control
2013-03-28 18:38:53 -04:00
John Costa
a5054184a1
move documentation changes to reStructuredText docs under website. https://github.com/dotcloud/docker/issues/42
2013-03-28 16:32:31 -04:00
Thatcher Peskens
09910785c8
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Conflicts:
docs/sources/examples/python_web_app.rst
2013-03-28 12:48:32 -07:00
Shawn Siefkas
523803d633
Handling iptables() errors more usefully during portmapper setup
2013-03-28 14:44:54 -05:00
Thatcher Peskens
4bd21e0d7f
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
2013-03-28 12:36:14 -07:00
Shawn Siefkas
c66d2b6a53
Return error when iptables is not found
2013-03-28 14:30:56 -05:00
Thatcher Peskens
da69df5f42
Added the lego illustration to the docs.docker.io 'homepage'
2013-03-28 12:27:37 -07:00
Thatcher Peskens
32b58159cd
Changed the lego illustration on /README.md to the version which contains the copyright in the image itself.
2013-03-28 12:18:22 -07:00
Shawn Siefkas
dfc3904f77
Looking for iptables in PATH
2013-03-28 14:02:50 -05:00
Solomon Hykes
4825d3a537
Merge branch 'master' of ssh://github.com/dotcloud/docker
2013-03-28 11:54:33 -07:00
Ken Cochrane
5c639118d3
fixed some of the syntax in example
...
The example was broken, I updated it to work with latest version of code.
2013-03-28 15:51:10 -03:00
Thatcher Peskens
9bc7e71f16
Removed $'s from examples to make them easier to copy paste
2013-03-28 11:50:00 -07:00
Solomon Hykes
19316955dd
Merge remote-tracking branch 'origin/174-remove_image_twice-fix'
2013-03-28 11:48:41 -07:00
Thatcher Peskens
172f746e4d
Fixed links on gettingstarted to point to the right places in docs
2013-03-28 11:44:33 -07:00
Solomon Hykes
47e5d2f5e1
Merge remote-tracking branch 'origin/docs'
2013-03-28 11:12:00 -07:00
Thatcher Peskens
70594bdd16
Merge remote-tracking branch 'dotcloud/master' into local/dotcloud/docs
2013-03-28 10:58:01 -07:00
Ken Cochrane
09e69e45a6
Merge pull request #225 from dhrp/readthedocs
...
#225 Update the docs to work with http://docs.docker.io
2013-03-28 06:58:21 -07:00
Ken Cochrane
9528b8685f
Merge pull request #229 from mynamewastaken/master
...
Fixed typo in description
2013-03-28 06:55:40 -07:00
mynamewastaken
b3cbe87b62
Update README.md
...
Fixed typo
2013-03-28 02:55:28 -05:00
Guillaume J. Charmes
6a236184af
Change hardcoded "0" onto os.Stdin.Fd()
2013-03-27 23:56:36 -07:00
Guillaume J. Charmes
108acc0511
#214 Better signal handling
2013-03-27 23:54:53 -07:00
Charles Hooper
e37ce11cfa
Merge pull request #227 from chooper/issue226_vagrant
...
Remove /usr/local/bin/docker from Vagrant VirtualMachine image during provisioning
2013-03-27 22:56:37 -07:00
Charles Hooper
fa89076673
Remove /usr/local/bin/docker
2013-03-28 05:28:11 +00:00
Charles Hooper
5aba56e0e0
Merge remote-tracking branch 'upstream/master'
2013-03-28 02:08:04 +00:00
Charles Hooper
daa7e4a203
Merge pull request #184 from titanous/simplify-vagrant
...
vagrant: Simplify provisioning to build from repo
2013-03-27 19:07:20 -07:00
Jonathan Rudenberg
a3ab89df2b
vagrant: Simplify provisioning to build from repo
...
This sets up an idiomatic Go workspace in /opt/go with the source
shared from the host directory in
/opt/go/src/github.com/dotcloud/docker and docker installed into
/opt/go
2013-03-27 21:55:25 -04:00
Thatcher Peskens
90fb5dc962
Made all paths "pretty url's" including gettingstarted.
2013-03-27 17:01:50 -07:00
Thatcher Peskens
3b71336edc
Made changes to incorporate extermal docs.docker.io. Also took out /documentation/ dir so sources are easier accessible and the folder is not redundant on docs.docker.io/documentation/
2013-03-27 16:43:13 -07:00
Guillaume J. Charmes
baea0a98f8
Add unit test for #174 Delete image already deleted then repulled
2013-03-27 12:09:58 -07:00
Solomon Hykes
d8dc6d4583
Merged branch sa2ajj/top-level-makefile
2013-03-27 11:50:01 -07:00
Charles Hooper
95d87f1ac0
Merge remote-tracking branch 'upstream/master'
2013-03-27 14:50:42 +00:00
Charles Hooper
7e9975d00a
Merge pull request #205 from crazysim/docker-local-shared
...
Use the directory where the Vagrantfile is located for SyncFolders instead of a hard-coded "~/docker"
2013-03-27 07:34:58 -07:00
Ken Cochrane
212a044a55
changed docker import to docker pull
...
changed docker import to docker pull, still need to make sure that the image is in the registry.
2013-03-27 10:44:20 -03:00
Ken Cochrane
165a7f3670
change docker import to docker pull
...
change docker import to docker pull in the basecommands doc
2013-03-27 10:43:05 -03:00
Ken Cochrane
0d75c68e5e
Merge pull request #209 from gottagetmac/patch-1
...
Fixed typo in command description for pull
2013-03-27 06:06:15 -07:00
Daniel Robinson
ff04ce3ddf
Fixed typo in command description for pull
2013-03-27 10:02:11 -03:00
Nelson Chen
43213dfc4a
use the directory where the vagrantfile is located for mounting
2013-03-26 23:14:50 -07:00
Solomon Hykes
4a086dfc08
Fixed broken examples in docs
2013-03-26 20:28:46 -07:00
Charles Hooper
6b54a439b2
Merge pull request #204 from dhrp/master
...
Added amazon install path to documentation.
2013-03-26 20:23:21 -07:00
Charles Hooper
00b81936aa
Merge pull request #192 from chooper/vagrant11-providers
...
Fix AWS provisioning with Vagrant
2013-03-26 20:18:09 -07:00
Solomon Hykes
b2e16f941d
Merge pull request #199 from dotcloud/smalldocs
...
Small update to docs
2013-03-26 20:12:03 -07:00
Solomon Hykes
72563925a1
Merge pull request #200 from dhrp/update-examples
...
Update examples
2013-03-26 20:11:07 -07:00
