Daniel Mizyrycki
177513451e
Merge pull request #827 from dotcloud/dev_environment_update
...
Update "Setting Up a Dev Environment" doc, with modern golang PPA and stable lxc kernel
Upstream-commit: 1cc4049e82263ee23e27cfae2900120aa87f50a5
Component: engine
2013-06-06 09:48:19 -07:00
Victor Vieux
4c703f4b7e
add [] and move errors to stderr
...
Upstream-commit: 4107701062bc729d06e1729e2b4c8c92b3b8b4f2
Component: engine
2013-06-06 15:45:08 +00:00
Victor Vieux
57300503a5
allow multiple params in inspect
...
Upstream-commit: a799cdad3e25136ff313d692b9972cb725754055
Component: engine
2013-06-06 15:22:54 +00:00
Victor Vieux
11abae76ab
changed to 12.04 and add kernel
...
Upstream-commit: a118ad90edbb232806345c4038f3e9e68098648c
Component: engine
2013-06-06 12:36:28 +00:00
Thatcher Peskens
1dbf41a0b1
Fixed some links
...
* Added Google group to FAQ on docs
* Changed IRC link
* Fixed link to contributing broken by 326faec
Upstream-commit: 0f23fb949dd894ff70641cc01ac116aa55083157
Component: engine
2013-06-05 18:06:51 -07:00
Thatcher
106de1dac7
Merge pull request #817 from dhrp/blog-in-navigation
...
Modified the navigation in both website and documentaion to include the blog.
Upstream-commit: f1992eeea5d7945164f2732aea805ad3a06cc3b8
Component: engine
2013-06-05 17:28:19 -07:00
Solomon Hykes
f9dd73b38e
hack/PRINCIPLES.md: a list of principles guiding Docker's design. The goal is to scale the decision-making in the project and remove @shykes as a bottleneck as much as possible
...
Upstream-commit: 97d5f525f42cae0468239de0a924d6fda920b48a
Component: engine
2013-06-05 17:27:53 +02:00
Solomon Hykes
4a7f6e2213
hack/ROADMAP.md: a high-level roadmap. Make a pull request to suggest changes
...
Upstream-commit: 2ea29ce0ef5bd507497fe65d2507bc6ff52fd9fb
Component: engine
2013-06-05 17:26:26 +02:00
Solomon Hykes
493cee7e83
Merge pull request #822 from lopter/master
...
* Client: Print the container id before the hijack in `docker run` (see also #804 )
Upstream-commit: 068076f775e88526bbfa19734fc1c34232e961b5
Component: engine
2013-06-05 08:08:30 -07:00
Solomon Hykes
3c1eb7bce7
Merge pull request #812 from dotcloud/809-progress_message-fix
...
* Remote API: Fix progress message in client
Upstream-commit: 34c8b24211c51b6f48109e2c9d23212153c6acaa
Component: engine
2013-06-05 07:27:31 -07:00
Victor Vieux
28f01e9e4d
update doc to newer go
...
Upstream-commit: e3cc625315ffdc47e6ea8d94812c7423853435b8
Component: engine
2013-06-05 13:19:49 +00:00
Victor Vieux
e1f455fc5a
bump to master
...
Upstream-commit: b4682e6707301b650f041b877db0ea0053a9b340
Component: engine
2013-06-05 10:19:51 +00:00
Solomon Hykes
7107c2c6ed
Merge pull request #818 from johncosta/ubuntu-1304-add-apt-repository
...
Remove provider specifc language
Upstream-commit: 04050c4173b92b6f7b4d6a6da812dc8cb955c01f
Component: engine
2013-06-05 02:40:09 -07:00
Louis Opter
3e3f9aa3ed
Print the container id before the hijack in docker run (see also #804 )
...
This is useful when you want to get the container id before you start to
interact with stdin (which is what I'm doing in dotcloud/sandbox).
Upstream-commit: 7e6ede63794b54bcc0d67d86ea60e76b701d286f
Component: engine
2013-06-04 15:32:59 -07:00
Guillaume J. Charmes
82ddfc6a07
Put back panic for go1.0.3 compatibility
...
Upstream-commit: 7ef9833dbb299ebf796092a6921127ea77d38337
Component: engine
2013-06-04 14:26:40 -07:00
Guillaume J. Charmes
2dea62a6a6
Merge pull request #808 from dotcloud/795-lintify
...
Cleanup source
Upstream-commit: c1ee9bf8817980c4577f914c0bc7b532f4b3000c
Component: engine
2013-06-04 14:20:38 -07:00
John Costa
2fdc41e83d
Remove provider specifc language
...
Upstream-commit: c000ef194c0259bfe631222b19a2bc204281f836
Component: engine
2013-06-04 16:01:38 -04:00
Ken Cochrane
0661d79fa2
Merge pull request #802 from johncosta/ubuntu-1304-add-apt-repository
...
- Documentation: adding missing dependency to the ubuntu linux install page.
Upstream-commit: 479ac9afa7159f2da7c9cb4dd33fef8a4cf85474
Component: engine
2013-06-04 11:55:34 -07:00
Thatcher Peskens
7b912efeab
Modified the navigation in both website and documentaion to include the Blog.
...
Upstream-commit: 716892b95dd292c62d9bc7ca2951176e94657b00
Component: engine
2013-06-04 11:41:54 -07:00
Thatcher
a70741569b
Merge pull request #796 from dhrp/added-and-fixed-links
...
Added and fixed some links (closes #502 )
Upstream-commit: d7a6485dfe5b5d8db9c1eba308bca88f086833ad
Component: engine
2013-06-04 11:28:40 -07:00
Victor Vieux
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
Victor Vieux
0b2167b3b8
fix progress message in client
...
Upstream-commit: 3922691fb99a99cec0a5d239da522cc3d8778e6c
Component: engine
2013-06-04 16:09:08 +00:00
Sam Alba
a28b4da480
Merge pull request #810 from dotcloud/proxy-fix
...
fix regression on proxy
Upstream-commit: c566c8efc7dad967e1dcb59afbe034fa42f543ff
Component: engine
2013-06-04 08:46:40 -07:00
Victor Vieux
ae659077aa
fix proxy
...
Upstream-commit: 06b585ce8a397fffcc9051e2faa6f968e51fccd5
Component: engine
2013-06-04 15:44:27 +00:00
John Costa
f0b09674bb
some installations of ubuntu 13.04 (digital ocean Ubuntu 13.04 x64 Server in this case) require software-properties-common to be installed before being able to use add-apt-repository
...
Upstream-commit: e61af8bc62c84a1bc70d0b323c1b6bf21dddb4b6
Component: engine
2013-06-04 10:40:44 -04:00
Victor Vieux
9c0086fb7d
drop/omit
...
Upstream-commit: 86ada2fa5d00820288df8a59eca3deef83f4aeb6
Component: engine
2013-06-04 13:51:12 +00:00
Victor Vieux
51d3c4635e
go vet
...
Upstream-commit: b515a5a9ec5792c67be5fe8476df96903f43df71
Component: engine
2013-06-04 13:24:58 +00:00
Michael Crosby
19f2b9dadf
Add flag to enable cross domain requests in Api
...
Add the -api-enable-cors flag when running docker
in daemon mode to allow CORS requests to be made to
the Remote Api. The default value is false for this
flag to not allow cross origin request to be made.
Also added a handler for OPTIONS requests the standard
for cross domain requests is to initially make an
OPTIONS request to the api.
Upstream-commit: 6d5bdff3942ce5e030b2cbd1510f418de25a1a53
Component: engine
2013-06-03 21:39:00 -04:00
Sam Alba
b65061b897
Merge pull request #797 from dotcloud/registry-fix-missing-body-close
...
registry.go: Fixed missing Body.Close()
Upstream-commit: 10ef4f7f39681ec538dbd535971dddb420666f27
Component: engine
2013-06-03 14:43:50 -07:00
Sam Alba
306e5f4f64
Disabled HTTP keep-alive in the default HTTP client for Registry calls
...
Upstream-commit: cff3b37a61b8da883437eec799b7b852d22538f0
Component: engine
2013-06-03 14:42:21 -07:00
Guillaume J. Charmes
717b10789e
Minor changes in registry.go
...
Upstream-commit: 82dd963e08778f8c563e058f1b19ccc358965615
Component: engine
2013-06-03 12:20:52 -07:00
Sam Alba
a771e69314
Fixed missing Body.Close when doing some HTTP requests. It should improve some request issues.
...
Upstream-commit: 830c458fe761aca5ad2facec33b3d0798caab116
Component: engine
2013-06-03 12:14:57 -07:00
Thatcher Peskens
82e1f15eb6
Changed some text on the website to include docker-club
...
Fixed a link in the FAQ on the docs
Fixed a detail in the Makefile for pushing the site to dotcloud
Upstream-commit: 38f29f7d0c9cbdb4c458834d403fc128dcce3117
Component: engine
2013-06-03 11:45:19 -07:00
Solomon Hykes
97e782d8ec
Bumped version to 0.4.0
...
Upstream-commit: a8ae398bf52e97148ee7bd0d5868de2e15bd297f
Component: engine
2013-06-03 10:59:48 -07:00
Guillaume J. Charmes
f60d18aee0
Merge pull request #794 from dotcloud/780-diff-fix2
...
- Runtime: remove TrimLeft as it's go1.1
Upstream-commit: 7a4408f608a6500cc784801616eb8c034b052e04
Component: engine
2013-06-03 10:41:08 -07:00
Victor Vieux
13478f8034
remove TrimLeft as it's go1.1
...
Upstream-commit: 854039b6ba9c707af07f9966b39150ce23150920
Component: engine
2013-06-03 17:25:51 +00:00
Guillaume J. Charmes
c899bd530a
Merge pull request #792 from dotcloud/780-diff-fix
...
- Runtime: fix Path corruption in 'docker diff'
Upstream-commit: 070923b14f734fe14bec4f0a4cd406f0101671d3
Component: engine
2013-06-03 10:06:25 -07:00
Victor Vieux
bf3d64f839
added test
...
Upstream-commit: 71b1657e8d22b6dfa0a426f6244c6a3101f66bc4
Component: engine
2013-06-03 17:02:57 +00:00
Guillaume J. Charmes
86bcc0fb50
Merge pull request #793 from dotcloud/774-remove_login_check_on_pull-fix
...
- Registry: remove login check on pull
Upstream-commit: 1bafe9da26c9f4671dbdf54f4a45956dd01f1d7d
Component: engine
2013-06-03 09:37:02 -07:00
Victor Vieux
93fe030b0e
remove check on login
...
Upstream-commit: 1ce4ba6c9f381f7931615644675b0cad33e74492
Component: engine
2013-06-03 15:33:29 +00:00
Guillaume J. Charmes
7aca08c70b
Merge pull request #784 from dotcloud/remove_cgo_dependency
...
* Runtime: Remove cgo dependency
Upstream-commit: 2b1b3c1270c41a1c4c71ba2be9f33af68ea22861
Component: engine
2013-06-03 07:03:17 -07:00
Guillaume J. Charmes
7c20a7a163
Update test to reflect new ApiInfo struct
...
Upstream-commit: 8243f2510e0ff0af8df18bf0febab819529106d4
Component: engine
2013-06-03 06:44:00 -07:00
Guillaume J. Charmes
d1a021f5ce
Merge pull request #772 from dotcloud/improve_version_info_cmds
...
* API: Improve version info cmds
Upstream-commit: 0443cc351d1202063c79a4de5497878f9a9e674e
Component: engine
2013-06-03 06:36:09 -07:00
Victor Vieux
b46afe4bec
fix Path corruption in 'docker diff'
...
Upstream-commit: e16c93486d16ac4f3a05f720ee6478b5cef93f10
Component: engine
2013-06-03 10:19:20 +00:00
Solomon Hykes
d6fb397281
Meta: added Guillaume as primary maintainer for tty code
...
Upstream-commit: e42eb7fa8c22e7451e06c28d9125fc7534239c89
Component: engine
2013-06-02 23:42:18 -07:00
Solomon Hykes
59649c5a44
Merge pull request #787 from gasi/nodejs-centos-docs
...
* Documentation: Deploying a Node.js Web App on CentOS
* Documentation: small formatting improvements
Upstream-commit: cebfde9ea550677d596520448f43cde6de3605c0
Component: engine
2013-06-02 23:27:29 -07:00
Solomon Hykes
d679be7e02
Merge pull request #785 from jweede/master
...
* Documentation: spelling correction in website
Upstream-commit: eff7a15bea95402846df9fea604c5a7040f43055
Component: engine
2013-06-02 23:14:09 -07:00
Daniel Gasienica
43b70fa498
Document installation of npm dependencies /ht @grigio
...
Upstream-commit: 82dadc200593e39f0979159d46afccf64f1e7a83
Component: engine
2013-06-02 20:10:22 -07:00
Guillaume J. Charmes
7597a88061
Merge pull request #789 from samjsharpe/fix-extra-brace
...
Removes a brace in the description of the wait command
Upstream-commit: 2d52d4d61490a44203bfb614076dbf3d806b2c14
Component: engine
2013-06-02 15:22:11 -07:00
Sam J Sharpe
1731739b24
Removes a brace in the description of the wait command
...
Upstream-commit: ca5ae266b762d34075524d869e27f0daaa79265c
Component: engine
2013-06-02 22:40:56 +01:00