Commit Graph
828 Commits
Author SHA1 Message Date
Ken Cochrane 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
Ken Cochrane 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
Daniel Robinson 1824784a58 Fixed typo in command description for pull
Upstream-commit: ff04ce3ddfc5bcd681c580b0b4e739e8c737e5b9
Component: engine
2013-03-27 10:02:11 -03:00
Nelson Chen 7930efd497 use the directory where the vagrantfile is located for mounting
Upstream-commit: 43213dfc4a441ca347cd97ceca219e8e021f08ef
Component: engine
2013-03-26 23:14:50 -07:00
Solomon Hykes 3c193f2186 Fixed broken examples in docs
Upstream-commit: 4a086dfc0859fb3053925f1651d39056ef7dbfd6
Component: engine
2013-03-26 20:28:46 -07:00
Charles Hooper 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
Charles Hooper 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
Solomon Hykes 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
Solomon Hykes 3117b8a97a Merge pull request #200 from dhrp/update-examples
Update examples
Upstream-commit: 72563925a1e38ba99007c56efefdd8ae4b73df4f
Component: engine
2013-03-26 20:11:07 -07:00
Hunter Blanks 5f2b9d90ce docs - remove references to run -a
Upstream-commit: 7e4ac6c689a00760b38b32edd91f1885e2237cd5
Component: engine
2013-03-26 19:31:50 -07:00
Charles Hooper 3bf53727e0 Stop using custom AMI and use standard Ubuntu AMI
Upstream-commit: 8461196a794d0ccd42b958fd93b833b7df9a8ca5
Component: engine
2013-03-27 01:41:47 +00:00
Charles Hooper 4862ca70d4 Fix Rackspace cloud user, remove dupe /home/vagrant definition
Upstream-commit: 5bec4b8f040f366a5a1eed294d98e383d64b46e7
Component: engine
2013-03-27 01:41:06 +00:00
Thatcher Peskens b89eec4029 not debian, but ubuntu is in base image
Upstream-commit: 502f772839859823639aef1add8d5463e5be11fc
Component: engine
2013-03-26 18:28:46 -07:00
Thatcher Peskens d0ddb11c83 Updated hello world examples
Upstream-commit: 8cfaf658ccae041400f142227d0813ceb0f263db
Component: engine
2013-03-26 18:21:52 -07:00
Charles Hooper 8493716682 Remove duplicate user definition
Upstream-commit: 2b7284db4f4c5b311eadd0432577bf0c263c2cce
Component: engine
2013-03-27 01:20:45 +00:00
Charles Hooper 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
root 8937d76b7b added copyright for LEGO picture
Upstream-commit: 378dacdf1cc65c9b9742facaa75c73d807616643
Component: engine
2013-03-26 17:25:35 -07:00
Thatcher Peskens 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
Solomon Hykes 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
Solomon Hykes 798f3b00da Add unit test for container id format
Upstream-commit: a8ae0aafe36664ce3e28909045f5aff016370035
Component: engine
2013-03-26 16:54:13 -07:00
Jonathan Rudenberg a2dbca10d0 Remove extraneous rand.Seed
Upstream-commit: 9518503ebed1e4165d25e3c5b5164e61f457c14c
Component: engine
2013-03-26 19:29:53 -04:00
Jonathan Rudenberg 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
Thatcher Peskens 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
Solomon Hykes 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
Solomon Hykes 6ea70d3e22 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 84d1929973a53717151bfb02d006f3c2d430e3c3
Component: engine
2013-03-26 15:36:07 -07:00
Charles Hooper 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
Solomon Hykes 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
Vivek Agarwal 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
Thatcher Peskens b916c0c9c0 Merge remote-tracking branch 'dotcloud/docs'
Upstream-commit: 261003ceb087e9ce8a13fd4420d866ac2ee537ea
Component: engine
2013-03-26 14:52:00 -07:00
Thatcher Peskens af9dcb3278 Typo in macosx tutorial
Upstream-commit: 84df72222d82fe5530da8f9c42156169519037d8
Component: engine
2013-03-26 14:31:45 -07:00
Charles Hooper 438324da8d Fix issue where Vagrant AWS deploys outside of my dev account would fail
Upstream-commit: afdf29e57fe2213698645298c2381cab27baadc0
Component: engine
2013-03-26 21:21:54 +00:00
Daniel Mizyrycki 155c524080 Merge pull request #181 from dhrp/master
These are the necessary changes to tell github to not use jekyill and listen to http://docker.io
Upstream-commit: 262be7904120f4126e99bb282a550efa3cdeba53
Component: engine
2013-03-26 13:20:51 -07:00
Solomon Hykes 1cd9607e3e Merge remote-tracking branch 'origin/175-auto_download_run-feature'
Upstream-commit: 8da1810975fcdaa1535debf4c024a2779ef3e574
Component: engine
2013-03-26 13:20:32 -07:00
Solomon Hykes fd750d8fcb Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 9df7023497dcd59f196c1a3ec4b44c4c44bbe033
Component: engine
2013-03-26 13:15:21 -07:00
Solomon Hykes 60f33c5a95 Set the container's hostname to the truncated ID
Upstream-commit: 54fa59c8ec0e20c709cc7b2049f19271750adaab
Component: engine
2013-03-26 13:14:44 -07:00
Solomon Hykes da162485ea Example of sharing an image in the README
Upstream-commit: 2664139da48d0c9f5ff20e2049242ce159301ed8
Component: engine
2013-03-26 13:07:06 -07:00
Solomon Hykes 6fac2de23b Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 6bf4a10ed4c0f61fd9bd4b13370524eb5b0f47d6
Component: engine
2013-03-26 12:57:42 -07:00
Solomon Hykes 3970b67ac2 Added missing 'docker pull' to first example
Upstream-commit: 7f79fabaeeb642ae344c7ce1796034bc0021bbc1
Component: engine
2013-03-26 12:52:11 -07:00
Solomon Hykes 2f2e7d519a Rephrased answer to Q4 in the FAQ
Upstream-commit: 3813fa8a16ae7e622375182127f764995faf3c53
Component: engine
2013-03-26 12:34:23 -07:00
Daniel Mizyrycki 7d23911e9e Add more links and a question to the faq
Upstream-commit: 75a116bdaa6f1f734ec73e4fe4a1ef6f810d10ff
Component: engine
2013-03-26 12:14:58 -07:00
Thatcher Peskens cae274c6a4 Added files REQUIRED to have succesfull gh-pages deploy (i.c.w. sphinx)
Upstream-commit: f87aa7e336ea4eba16042d17304cca146d75ebb7
Component: engine
2013-03-26 12:00:46 -07:00
Solomon Hykes f707fd3740 Emphasized 'not for production' warning
Upstream-commit: 19040035116edf70a42bc825785de6b3f637c120
Component: engine
2013-03-26 11:58:42 -07:00
Solomon Hykes bdb6466248 Changed project description in home page
Upstream-commit: 84cca8afc82114df1893802c06b2920029908e9d
Component: engine
2013-03-26 11:46:51 -07:00
Solomon Hykes 5240f2fb3e Merge remote-tracking branch 'dhrp/master'
Upstream-commit: 1a96ce552f1d6a4f07db48a1bd2f03edcaa3c26f
Component: engine
2013-03-26 11:34:21 -07:00
Solomon Hykes 6b23a9490b New 'make github-deploy' rule to deploy the docs to github-pages
Upstream-commit: 7db1890c9926191367697826c0de881644a05286
Component: engine
2013-03-26 11:27:36 -07:00
Charles Hooper 6089bc44f0 Use new AMI that won't cause issues with cloud-init apply_creds
Upstream-commit: 5cebc226cc0d734936a3d63e10027d46f39e8025
Component: engine
2013-03-26 17:40:56 +00:00
Thatcher Peskens c6e6cf55a2 Added two user quotes. Cleanup of images.
Upstream-commit: 1c5162c5a9e47a5e6f774f2bf31ef6f156d2e18b
Component: engine
2013-03-26 10:03:10 -07:00
Solomon Hykes 93d39f0eda Merged documentation
Upstream-commit: 53641e8b8df0373a1b53ec9b9d83e519344491e8
Component: engine
2013-03-26 09:49:10 -07:00
Solomon Hykes ff1bdea316 Merge pull request #168 from johncosta/42-contribution-guidlines
incorporate feedback from https://github.com/dotcloud/docker/issues/42
Upstream-commit: 038fb523f1c24a093aaaf233a92d1d78c2f0e360
Component: engine
2013-03-26 09:42:14 -07:00
Solomon Hykes 1b5288334c Merge pull request #169 from sa2ajj/no-executable-sources
remove executable bit from lxc_template.go
Upstream-commit: b70858ccae592146863db6e6fe0911ed4f6578e6
Component: engine
2013-03-26 09:41:37 -07:00