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
af9dcb3278
Typo in macosx tutorial
...
Upstream-commit: 84df72222d82fe5530da8f9c42156169519037d8
Component: engine
2013-03-26 14:31:45 -07:00
70a99486a6
Improve document <title>'s for the docs.
...
Upstream-commit: 08f1e3af4828c163a44ecd57b798954d12182983
Component: engine
2013-03-26 21:25:42 +00:00
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
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
1cd9607e3e
Merge remote-tracking branch 'origin/175-auto_download_run-feature'
...
Upstream-commit: 8da1810975fcdaa1535debf4c024a2779ef3e574
Component: engine
2013-03-26 13:20:32 -07:00
fd750d8fcb
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 9df7023497dcd59f196c1a3ec4b44c4c44bbe033
Component: engine
2013-03-26 13:15:21 -07:00
60f33c5a95
Set the container's hostname to the truncated ID
...
Upstream-commit: 54fa59c8ec0e20c709cc7b2049f19271750adaab
Component: engine
2013-03-26 13:14:44 -07:00
da162485ea
Example of sharing an image in the README
...
Upstream-commit: 2664139da48d0c9f5ff20e2049242ce159301ed8
Component: engine
2013-03-26 13:07:06 -07:00
6fac2de23b
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 6bf4a10ed4c0f61fd9bd4b13370524eb5b0f47d6
Component: engine
2013-03-26 12:57:42 -07:00
3970b67ac2
Added missing 'docker pull' to first example
...
Upstream-commit: 7f79fabaeeb642ae344c7ce1796034bc0021bbc1
Component: engine
2013-03-26 12:52:11 -07:00
2f2e7d519a
Rephrased answer to Q4 in the FAQ
...
Upstream-commit: 3813fa8a16ae7e622375182127f764995faf3c53
Component: engine
2013-03-26 12:34:23 -07:00
7d23911e9e
Add more links and a question to the faq
...
Upstream-commit: 75a116bdaa6f1f734ec73e4fe4a1ef6f810d10ff
Component: engine
2013-03-26 12:14:58 -07:00
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
f707fd3740
Emphasized 'not for production' warning
...
Upstream-commit: 19040035116edf70a42bc825785de6b3f637c120
Component: engine
2013-03-26 11:58:42 -07:00
bdb6466248
Changed project description in home page
...
Upstream-commit: 84cca8afc82114df1893802c06b2920029908e9d
Component: engine
2013-03-26 11:46:51 -07:00
5240f2fb3e
Merge remote-tracking branch 'dhrp/master'
...
Upstream-commit: 1a96ce552f1d6a4f07db48a1bd2f03edcaa3c26f
Component: engine
2013-03-26 11:34:21 -07:00
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
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
c6e6cf55a2
Added two user quotes. Cleanup of images.
...
Upstream-commit: 1c5162c5a9e47a5e6f774f2bf31ef6f156d2e18b
Component: engine
2013-03-26 10:03:10 -07:00
93d39f0eda
Merged documentation
...
Upstream-commit: 53641e8b8df0373a1b53ec9b9d83e519344491e8
Component: engine
2013-03-26 09:49:10 -07:00
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
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
413c6e15b8
Added line "docker is not ready for production" to tutorials
...
Upstream-commit: f7d69601c5bc6b27690b0be3de8eca1d6fbb4df9
Component: engine
2013-03-26 08:50:34 -07:00
81a51af591
Re-enabled help for run command and added client-side error messages when arguments are missing
...
Upstream-commit: 2333be46aae0473ec244176882bd6188d4c16ce2
Component: engine
2013-03-26 08:31:26 -07:00
56538b3d96
print the location of the built binary
...
Upstream-commit: f961ec55e72ae068c6153f2d20da5295d8d0a4c1
Component: engine
2013-03-26 17:19:58 +02:00
e8f06ad0d1
allow for verbose output from go tools
...
Upstream-commit: 21f55419b73eaff72fe3383b4ee142b04e701372
Component: engine
2013-03-26 17:19:58 +02:00
983b656909
slightly re-phrase the build from source in README
...
Upstream-commit: a26c58e27ef5ab1b017097fd8fc75d778d7c9eef
Component: engine
2013-03-26 17:19:58 +02:00
611da23156
do not print executed commands
...
Upstream-commit: 5a0010abe99869ffb4cb70917caa5ba35346e3e8
Component: engine
2013-03-26 17:19:58 +02:00
7d458dec18
use .gopath/ instead of build/
...
Upstream-commit: a57b37ed0e1531e7cc7b8c91ecf73a904c067891
Component: engine
2013-03-26 17:19:57 +02:00
ea9df9f422
add a test target
...
Upstream-commit: 6b4bc971fd7ea03227f88b66168b884e2272aea6
Component: engine
2013-03-26 17:19:57 +02:00
fc4f69a147
introduce top-level Makefile to build the docker binary
...
Upstream-commit: 7009d6c6ddc2acc77e7caa227c08ecf29d747298
Component: engine
2013-03-26 17:19:54 +02:00
2daddd5921
remove executable bit from lxc_template.go
...
Upstream-commit: b2b6d519c5429eae59d634a9ad1ff690b35e56ee
Component: engine
2013-03-26 16:36:49 +02:00
5695a50dbc
Fixed issue with misplaced cursor after output
...
Upstream-commit: 3cce89d8edc9c3151bd982c6b5acfa8c20d5ae71
Component: engine
2013-03-26 07:10:31 -07:00
de5854920d
#189 Fix the env in TTY mode
...
Upstream-commit: cca59081de9dc243fefe2816ded509bd4e1caad9
Component: engine
2013-03-26 07:01:59 -07:00
09362ffb5b
incorporate feedback from https://github.com/dotcloud/docker/issues/42
...
Upstream-commit: e53f45f621df0e8004fe3aa482a948eb32b709b6
Component: engine
2013-03-26 09:17:44 -04:00
42e716ab51
Try to fetch missing base only on "not found" error
...
Upstream-commit: 004a5310d93c5373d6db7683058fb392c8a3bd37
Component: engine
2013-03-26 05:28:17 -07:00
989ed91685
Improve the pre-push repository lookup for permisisons
...
Upstream-commit: 6ccd473127c334ee6dcd1694a1fddcf6cdc1fd32
Component: engine
2013-03-26 04:12:08 -07:00
052c42e18c
Add a lookup before pushing repository to check permissions
...
Upstream-commit: 161526d99d6543341b8651ab5c7ac1e503abb79f
Component: engine
2013-03-26 04:12:08 -07:00
d7ec470ec2
#174 Check if the image is already in the garbage before moving it. If it does, remove (really) the older one.
...
Upstream-commit: 069918e1fd9192f4395c286c50fa3a8f50002ada
Component: engine
2013-03-26 03:33:47 -07:00
be7ab169a5
#175 Add autodownload on run command
...
Upstream-commit: 91d78a10c33d9e1c33120634fb3dad5e0d247d28
Component: engine
2013-03-26 03:05:10 -07:00
778963e6af
Fixed a little problem in the style
...
Upstream-commit: 6f80674d66408cf2d3b225156d097cf624a6a48e
Component: engine
2013-03-25 21:16:33 -07:00
62790b50bf
Fixed a little problem in the style
...
Upstream-commit: 3150a789c15a5f1a8150007b83fe2072f8cb863e
Component: engine
2013-03-25 21:07:56 -07:00
