b3cbe87b62
Update README.md
...
Fixed typo
2013-03-28 02:55:28 -05:00
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
fa89076673
Remove /usr/local/bin/docker
2013-03-28 05:28:11 +00:00
5aba56e0e0
Merge remote-tracking branch 'upstream/master'
2013-03-28 02:08:04 +00:00
daa7e4a203
Merge pull request #184 from titanous/simplify-vagrant
...
vagrant: Simplify provisioning to build from repo
2013-03-27 19:07:20 -07:00
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
d8dc6d4583
Merged branch sa2ajj/top-level-makefile
2013-03-27 11:50:01 -07:00
95d87f1ac0
Merge remote-tracking branch 'upstream/master'
2013-03-27 14:50:42 +00:00
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
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
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
0d75c68e5e
Merge pull request #209 from gottagetmac/patch-1
...
Fixed typo in command description for pull
2013-03-27 06:06:15 -07:00
ff04ce3ddf
Fixed typo in command description for pull
2013-03-27 10:02:11 -03:00
43213dfc4a
use the directory where the vagrantfile is located for mounting
2013-03-26 23:14:50 -07:00
4a086dfc08
Fixed broken examples in docs
2013-03-26 20:28:46 -07:00
00b81936aa
Merge pull request #192 from chooper/vagrant11-providers
...
Fix AWS provisioning with Vagrant
2013-03-26 20:18:09 -07:00
b2e16f941d
Merge pull request #199 from dotcloud/smalldocs
...
Small update to docs
2013-03-26 20:12:03 -07:00
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
7e4ac6c689
docs - remove references to run -a
2013-03-26 19:31:50 -07:00
9e5a25c100
Merge remote-tracking branch 'upstream/master'
2013-03-27 02:19:52 +00:00
8461196a79
Stop using custom AMI and use standard Ubuntu AMI
2013-03-27 01:41:47 +00:00
5bec4b8f04
Fix Rackspace cloud user, remove dupe /home/vagrant definition
2013-03-27 01:41:06 +00:00
2b7284db4f
Remove duplicate user definition
2013-03-27 01:20:45 +00:00
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
378dacdf1c
added copyright for LEGO picture
2013-03-26 17:25:35 -07:00
8513c179f3
Added files REQUIRED to have succesfull gh-pages deploy (i.c.w. sphinx)
2013-03-26 17:25:26 -07:00
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
a8ae0aafe3
Add unit test for container id format
2013-03-26 16:54:13 -07:00
9518503ebe
Remove extraneous rand.Seed
2013-03-26 19:29:53 -04:00
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
2ee3db6cd2
Merge pull request #193 from vivekagr/master
...
Fixed a misspelled command in the docs.
2013-03-26 15:39:48 -07:00
84d1929973
Merge branch 'master' of ssh://github.com/dotcloud/docker
2013-03-26 15:36:07 -07:00
195208593d
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
README.md
2013-03-26 22:30:49 +00:00
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
5cec37de53
Fixed a misspelled command in the docs.
...
`vagrant up` command was misspelled as `vagant up`.
2013-03-27 03:54:26 +05:30
e260e80814
Merge pull request #190 from dotcloud/189-broken_env_tty_mode-fix
...
#189 Fix the env in TTY mode
2013-03-26 14:44:30 -07:00
2d71e2a44c
Merge pull request #186 from pbogdan/fix-docs-document-title
...
Improve document <title>'s for the docs.
2013-03-26 14:36:43 -07:00
08f1e3af48
Improve document <title>'s for the docs.
2013-03-26 21:25:42 +00:00
afdf29e57f
Fix issue where Vagrant AWS deploys outside of my dev account would fail
2013-03-26 21:21:54 +00:00
8da1810975
Merge remote-tracking branch 'origin/175-auto_download_run-feature'
2013-03-26 13:20:32 -07:00
9df7023497
Merge branch 'master' of ssh://github.com/dotcloud/docker
2013-03-26 13:15:21 -07:00
54fa59c8ec
Set the container's hostname to the truncated ID
2013-03-26 13:14:44 -07:00
2664139da4
Example of sharing an image in the README
2013-03-26 13:07:06 -07:00
6bf4a10ed4
Merge branch 'master' of ssh://github.com/dotcloud/docker
2013-03-26 12:57:42 -07:00
7f79fabaee
Added missing 'docker pull' to first example
2013-03-26 12:52:11 -07:00
3813fa8a16
Rephrased answer to Q4 in the FAQ
2013-03-26 12:34:23 -07:00
75a116bdaa
Add more links and a question to the faq
2013-03-26 12:14:58 -07:00
1904003511
Emphasized 'not for production' warning
2013-03-26 11:58:42 -07:00
84cca8afc8
Changed project description in home page
2013-03-26 11:46:51 -07:00
1a96ce552f
Merge remote-tracking branch 'dhrp/master'
2013-03-26 11:34:21 -07:00
mynamewastaken