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
Solomon Hykes
19316955dd
Merge remote-tracking branch 'origin/174-remove_image_twice-fix'
2013-03-28 11:48:41 -07:00
Solomon Hykes
47e5d2f5e1
Merge remote-tracking branch 'origin/docs'
2013-03-28 11:12:00 -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
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
Solomon Hykes
f951f7876b
Merge pull request #203 from hblanks/remove-run-dash-a
...
docs - remove references to run -a
2013-03-26 20:08:25 -07:00
Hunter Blanks
7e4ac6c689
docs - remove references to run -a
2013-03-26 19:31:50 -07:00
Charles Hooper
9e5a25c100
Merge remote-tracking branch 'upstream/master'
2013-03-27 02:19:52 +00:00
Charles Hooper
8461196a79
Stop using custom AMI and use standard Ubuntu AMI
2013-03-27 01:41:47 +00:00
Charles Hooper
5bec4b8f04
Fix Rackspace cloud user, remove dupe /home/vagrant definition
2013-03-27 01:41:06 +00:00
Thatcher Peskens
502f772839
not debian, but ubuntu is in base image
2013-03-26 18:28:46 -07:00
Thatcher Peskens
8cfaf658cc
Updated hello world examples
2013-03-26 18:21:52 -07:00
Charles Hooper
2b7284db4f
Remove duplicate user definition
2013-03-27 01:20:45 +00:00
Charles Hooper
2b090320be
Merge remote-tracking branch 'upstream/master' into vagrant11-providers
...
Conflicts:
puppet/modules/docker/manifests/init.pp
2013-03-27 01:09:22 +00:00
root
378dacdf1c
added copyright for LEGO picture
2013-03-26 17:25:35 -07:00
Thatcher Peskens
8513c179f3
Added files REQUIRED to have succesfull gh-pages deploy (i.c.w. sphinx)
2013-03-26 17:25:26 -07:00
Solomon Hykes
a710475726
Merge pull request #135 from amesserl/raxcloud-support
...
Added support to use docker with Rackspace Cloud Servers
2013-03-26 16:55:01 -07:00
Solomon Hykes
a8ae0aafe3
Add unit test for container id format
2013-03-26 16:54:13 -07:00
Jonathan Rudenberg
9518503ebe
Remove extraneous rand.Seed
2013-03-26 19:29:53 -04:00
Jonathan Rudenberg
141b5fc7d7
Simplify id generation
...
Instead of using a SHA-256 of a random number, hex encode 32 bytes
of random data from crypto/rand (sourced from /dev/urandom).
2013-03-26 19:29:44 -04:00
Thatcher Peskens
709849e717
Added Amazon AWS tutorial (can be activated after @sub_'s pull request is accepted.
2013-03-26 16:29:21 -07:00
Solomon Hykes
2ee3db6cd2
Merge pull request #193 from vivekagr/master
...
Fixed a misspelled command in the docs.
2013-03-26 15:39:48 -07:00
Solomon Hykes
84d1929973
Merge branch 'master' of ssh://github.com/dotcloud/docker
2013-03-26 15:36:07 -07:00
Charles Hooper
195208593d
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
README.md
2013-03-26 22:30:49 +00:00
Solomon Hykes
846a9e8963
When doing a reverse-lookup of an image's tag, if the image has multiple tags, the first tag in alphabetical order will be used
2013-03-26 15:30:16 -07:00
Vivek Agarwal
5cec37de53
Fixed a misspelled command in the docs.
...
`vagrant up` command was misspelled as `vagant up`.
2013-03-27 03:54:26 +05:30
