81ccb33fbc
Merge remote-tracking branch 'origin/174-remove_image_twice-fix'
...
Upstream-commit: 19316955dd33eefc7f77f3c6b6591b47ba0cab82
Component: engine
2013-03-28 11:48:41 -07:00
9de6b5992b
Merge remote-tracking branch 'origin/docs'
...
Upstream-commit: 47e5d2f5e1af88f75faa7391fb29644b3254a8ae
Component: engine
2013-03-28 11:12:00 -07:00
7116449be0
Merge pull request #225 from dhrp/readthedocs
...
#225 Update the docs to work with http://docs.docker.io
Upstream-commit: 09e69e45a676a892f97d7dd36c5320261804e751
Component: engine
2013-03-28 06:58:21 -07:00
ab309d6f77
Merge pull request #229 from mynamewastaken/master
...
Fixed typo in description
Upstream-commit: 9528b8685f0a67bd52f2c4af59fdd01b93581727
Component: engine
2013-03-28 06:55:40 -07:00
8d4dfc89d5
Update README.md
...
Fixed typo
Upstream-commit: b3cbe87b62f00d0dcc207d4562c9dde99a708366
Component: engine
2013-03-28 02:55:28 -05:00
7908f586e1
Merge pull request #227 from chooper/issue226_vagrant
...
Remove /usr/local/bin/docker from Vagrant VirtualMachine image during provisioning
Upstream-commit: e37ce11cfa6e715d4fdc09a707beb46a99529295
Component: engine
2013-03-27 22:56:37 -07:00
338903c9fa
Remove /usr/local/bin/docker
...
Upstream-commit: fa89076673bd734cebff88717bf79461ecf8d505
Component: engine
2013-03-28 05:28:11 +00:00
fb22cbcb00
Merge remote-tracking branch 'upstream/master'
...
Upstream-commit: 5aba56e0e0799bfac69057f8fb47533c18cd41f1
Component: engine
2013-03-28 02:08:04 +00:00
91838166e9
Merge pull request #184 from titanous/simplify-vagrant
...
vagrant: Simplify provisioning to build from repo
Upstream-commit: daa7e4a2034f65197222eab94ea46e4d5a3400e7
Component: engine
2013-03-27 19:07:20 -07:00
73606e3c52
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
Upstream-commit: a3ab89df2b3d9ba654ba85af5d71d063d401f23f
Component: engine
2013-03-27 21:55:25 -04:00
c092632cc7
Made all paths "pretty url's" including gettingstarted.
...
Upstream-commit: 90fb5dc962650567f9872ecd17bae380b0355f72
Component: engine
2013-03-27 17:01:50 -07:00
33c9b9eb1f
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/
...
Upstream-commit: 3b71336edcd3798a11ea8a2f9c94b012357b32c3
Component: engine
2013-03-27 16:43:13 -07:00
df3673a895
Add unit test for #174 Delete image already deleted then repulled
...
Upstream-commit: baea0a98f84f7827485505425b23ee0ac7ce2a23
Component: engine
2013-03-27 12:09:58 -07:00
fe7f976896
Merged branch sa2ajj/top-level-makefile
...
Upstream-commit: d8dc6d4583a8bbe24c889f3a7dff749e4721fe2d
Component: engine
2013-03-27 11:50:01 -07:00
6d86e5ea2f
Merge remote-tracking branch 'upstream/master'
...
Upstream-commit: 95d87f1ac0bcbe5e2a848f716bbe64615f25bcfd
Component: engine
2013-03-27 14:50:42 +00:00
1d78df9479
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"
Upstream-commit: 7e9975d00af96e7b02244fa350d41415a3e1eeaf
Component: engine
2013-03-27 07:34:58 -07:00
c9e397a6f6
changed docker import to docker pull
...
changed docker import to docker pull, still need to make sure that the image is in the registry.
Upstream-commit: 212a044a55394f7b79f02344d5ea4ee72ed787d5
Component: engine
2013-03-27 10:44:20 -03:00
e80be7162d
change docker import to docker pull
...
change docker import to docker pull in the basecommands doc
Upstream-commit: 165a7f36709ad21d2e03c938855acf75a5a0c60a
Component: engine
2013-03-27 10:43:05 -03:00
f4ab6d113f
Merge pull request #209 from gottagetmac/patch-1
...
Fixed typo in command description for pull
Upstream-commit: 0d75c68e5ebe84c38bbdb2bf6b570618c8e61bee
Component: engine
2013-03-27 06:06:15 -07:00
1824784a58
Fixed typo in command description for pull
...
Upstream-commit: ff04ce3ddfc5bcd681c580b0b4e739e8c737e5b9
Component: engine
2013-03-27 10:02:11 -03:00
7930efd497
use the directory where the vagrantfile is located for mounting
...
Upstream-commit: 43213dfc4a441ca347cd97ceca219e8e021f08ef
Component: engine
2013-03-26 23:14:50 -07:00
3c193f2186
Fixed broken examples in docs
...
Upstream-commit: 4a086dfc0859fb3053925f1651d39056ef7dbfd6
Component: engine
2013-03-26 20:28:46 -07:00
9df86cc700
Merge pull request #204 from dhrp/master
...
Added amazon install path to documentation.
Upstream-commit: 6b54a439b2930ec93871c6b2e912ed0da71cfa48
Component: engine
2013-03-26 20:23:21 -07:00
e47391f32c
Merge pull request #192 from chooper/vagrant11-providers
...
Fix AWS provisioning with Vagrant
Upstream-commit: 00b81936aa5c89fae625c833c1d6a51d4d55d99a
Component: engine
2013-03-26 20:18:09 -07:00
4785d10988
Merge pull request #199 from dotcloud/smalldocs
...
Small update to docs
Upstream-commit: b2e16f941dea9e7ddd4a062b26df2a88473e5e11
Component: engine
2013-03-26 20:12:03 -07:00
3117b8a97a
Merge pull request #200 from dhrp/update-examples
...
Update examples
Upstream-commit: 72563925a1e38ba99007c56efefdd8ae4b73df4f
Component: engine
2013-03-26 20:11:07 -07:00
9e498994b1
Merge pull request #203 from hblanks/remove-run-dash-a
...
docs - remove references to run -a
Upstream-commit: f951f7876bac26749f53805940b9c6be58eadace
Component: engine
2013-03-26 20:08:25 -07:00
5f2b9d90ce
docs - remove references to run -a
...
Upstream-commit: 7e4ac6c689a00760b38b32edd91f1885e2237cd5
Component: engine
2013-03-26 19:31:50 -07:00
7629a61146
Merge remote-tracking branch 'upstream/master'
...
Upstream-commit: 9e5a25c100803f7a711344f4eeb28b78bd70bdf8
Component: engine
2013-03-27 02:19:52 +00:00
3bf53727e0
Stop using custom AMI and use standard Ubuntu AMI
...
Upstream-commit: 8461196a794d0ccd42b958fd93b833b7df9a8ca5
Component: engine
2013-03-27 01:41:47 +00:00
4862ca70d4
Fix Rackspace cloud user, remove dupe /home/vagrant definition
...
Upstream-commit: 5bec4b8f040f366a5a1eed294d98e383d64b46e7
Component: engine
2013-03-27 01:41:06 +00:00
b89eec4029
not debian, but ubuntu is in base image
...
Upstream-commit: 502f772839859823639aef1add8d5463e5be11fc
Component: engine
2013-03-26 18:28:46 -07:00
d0ddb11c83
Updated hello world examples
...
Upstream-commit: 8cfaf658ccae041400f142227d0813ceb0f263db
Component: engine
2013-03-26 18:21:52 -07:00
8493716682
Remove duplicate user definition
...
Upstream-commit: 2b7284db4f4c5b311eadd0432577bf0c263c2cce
Component: engine
2013-03-27 01:20:45 +00:00
55fc055158
Merge remote-tracking branch 'upstream/master' into vagrant11-providers
...
Conflicts:
puppet/modules/docker/manifests/init.pp
Upstream-commit: 2b090320beae64e1bf15102da5dfe96937a21a77
Component: engine
2013-03-27 01:09:22 +00:00
8937d76b7b
added copyright for LEGO picture
...
Upstream-commit: 378dacdf1cc65c9b9742facaa75c73d807616643
Component: engine
2013-03-26 17:25:35 -07:00
49781f66ae
Added files REQUIRED to have succesfull gh-pages deploy (i.c.w. sphinx)
...
Upstream-commit: 8513c179f30acc01ac9b2a5c3c9671f0a15277f0
Component: engine
2013-03-26 17:25:26 -07:00
8891668094
Merge pull request #135 from amesserl/raxcloud-support
...
Added support to use docker with Rackspace Cloud Servers
Upstream-commit: a71047572610c3c0960fc245d170fa32760383ea
Component: engine
2013-03-26 16:55:01 -07:00
798f3b00da
Add unit test for container id format
...
Upstream-commit: a8ae0aafe36664ce3e28909045f5aff016370035
Component: engine
2013-03-26 16:54:13 -07:00
a2dbca10d0
Remove extraneous rand.Seed
...
Upstream-commit: 9518503ebed1e4165d25e3c5b5164e61f457c14c
Component: engine
2013-03-26 19:29:53 -04:00
c8d7429350
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).
Upstream-commit: 141b5fc7d77fbe99fd42fb603688b842a5be34dd
Component: engine
2013-03-26 19:29:44 -04:00
5038ae520f
Added Amazon AWS tutorial (can be activated after @sub_'s pull request is accepted.
...
Upstream-commit: 709849e717da1f0c509d0cf62414141e62a09eb7
Component: engine
2013-03-26 16:29:21 -07:00
36b550c062
Merge pull request #193 from vivekagr/master
...
Fixed a misspelled command in the docs.
Upstream-commit: 2ee3db6cd28b20adb03c3b5114b48030a2ab065e
Component: engine
2013-03-26 15:39:48 -07:00
6ea70d3e22
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 84d1929973a53717151bfb02d006f3c2d430e3c3
Component: engine
2013-03-26 15:36:07 -07:00
03507a21ae
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
README.md
Upstream-commit: 195208593d842b2a38d7ff7161b5897b4adaea42
Component: engine
2013-03-26 22:30:49 +00:00
e03eece013
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
...
Upstream-commit: 846a9e8963ba58596b87024d5d108fea8d1c7399
Component: engine
2013-03-26 15:30:16 -07:00
cd3718412a
Fixed a misspelled command in the docs.
...
`vagrant up` command was misspelled as `vagant up`.
Upstream-commit: 5cec37de53d2ec207c2b1723bc694bcea9c57e7c
Component: engine
2013-03-27 03:54:26 +05:30
b916c0c9c0
Merge remote-tracking branch 'dotcloud/docs'
...
Upstream-commit: 261003ceb087e9ce8a13fd4420d866ac2ee537ea
Component: engine
2013-03-26 14:52:00 -07:00
61a1216610
Merge pull request #190 from dotcloud/189-broken_env_tty_mode-fix
...
#189 Fix the env in TTY mode
Upstream-commit: e260e808149d5ac4d0bfc4822d056a53fb277e66
Component: engine
2013-03-26 14:44:30 -07:00
0c1f3150d6
Merge pull request #186 from pbogdan/fix-docs-document-title
...
Improve document <title>'s for the docs.
Upstream-commit: 2d71e2a44ca75ebbb0bd782053f8cc8463cd5474
Component: engine
2013-03-26 14:36:43 -07:00
