bd3bf082e2
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: be15d5f2d916d1ea55a7c8d2288fb77a766afaec
Component: engine
2013-06-11 10:09:34 -07:00
a2c3983005
More principles. Raw and unstructured to spawn discussion.
...
Upstream-commit: 5918a5a3228442cdf55bed6591090c00ebb1357c
Component: engine
2013-06-11 09:27:36 -07:00
0117018182
Merge pull request #865 from dotcloud/errors_commands-fix
...
Display StatusText as error when empty body in commands.go
Upstream-commit: f8af296e6f8c10cb6740dd054f1538f318640f0f
Component: engine
2013-06-11 09:16:54 -07:00
7b13257108
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 432e18990b1cfbae014ff41c5445658a8d410aeb
Component: engine
2013-06-11 08:58:23 -07:00
2bb72522f6
add Michael Crosby to AUTHORS
...
Upstream-commit: 3ea6a2c7c39695fbfe3dfe228db00335c9937c14
Component: engine
2013-06-11 10:17:39 +00:00
604adb2ef8
* Remote Api: Add flag to enable cross domain requests
...
Upstream-commit: 20bf0e00e81fdff34c821fd880a92e822fb5ba15
Component: engine
2013-06-11 10:12:36 +00:00
6315b0d212
Add OPTIONS to route map
...
Move the OPTIONS method registration into the existing
route map. Also add support for empty paths in
the map.
Upstream-commit: dd53c457d75a49e6e140c6d71642b237f3ee9056
Component: engine
2013-06-10 16:10:40 -09:00
2d226181f9
Add explicit status response to OPTIONS handler
...
Write the http.StatusOK header in the OPTIONS
handler and update the unit tests to refer to the
response code using the const from the http package.
Upstream-commit: ac599d652846f6456366b8028b2c38da0565d8b1
Component: engine
2013-06-10 14:44:10 -09:00
ec363b1d2d
Add links to libraries, fix #800
...
Upstream-commit: ca4597e9d74474e4211cee9bf48513643a28fdf9
Component: engine
2013-06-10 15:22:34 -07:00
b4019d7d98
Add list of Docker Remote API Client Libraries. Fixes #800 .
...
Upstream-commit: eeea9ac9468a73bb9514a2d729060889b48384ee
Component: engine
2013-06-10 15:17:27 -07:00
c612f1e4ee
Add Cors and OPTIONS route unit tests
...
Move creating the router and populating the
routes to a separate function outside of
ListenAndServe to allow unit tests to make
assertions on the configured routes and handler
funcs.
Upstream-commit: 0a28628c02d486512dc7e62eb54ccfd27eaa0a27
Component: engine
2013-06-10 13:02:40 -09:00
6b64f66055
Merge pull request #869 from fsouza/fix-api-docs
...
docs/api/remote: fix rst syntax in the "Search images" section
Upstream-commit: bcc4754dc14037224517e874acd36244953a705b
Component: engine
2013-06-10 14:21:39 -07:00
032df4df5a
Merge pull request #840 from dhrp/just-fixed-some-links
...
Fixed some links. Closes #839 #838 #835
Upstream-commit: 5712e37437ffcfbb17d75f7f9c977bf1d4013042
Component: engine
2013-06-10 13:51:43 -07:00
49bbfc9be5
docs/api/remote: fix rst syntax in the "Search images" section
...
Upstream-commit: b1ed75078ea04de8725ce5c39ae3b463f86faf4e
Component: engine
2013-06-10 16:07:57 -03:00
82d926ed08
Merge pull request #814 from dotcloud/708-pushpull-multislash
...
Support for special namespace 'src' (highland support)
Upstream-commit: 47d7486bbe9d87eeab94fb9f1d78ffdfdf0c66f8
Component: engine
2013-06-10 11:29:39 -07:00
dc9ee2c506
Escape remote names on repo push/pull
...
Upstream-commit: d227af1edd5366df91f96193ddff3ff43d54b4f4
Component: engine
2013-06-10 11:28:27 -07:00
6e3420c0ae
Support for special namespace 'src' (highland support)
...
Upstream-commit: 4e180107314a0a7768120ed66e615c8f668677bd
Component: engine
2013-06-10 11:28:26 -07:00
52be2c7cb8
Merge pull request #867 from Turbo87/patch-1
...
Fixed broken link in README
Upstream-commit: 2a6a1d439c28f5cc2f7ab472305b3fc0baaf8c0b
Component: engine
2013-06-10 10:57:09 -07:00
bba3c9d252
Fixed broken link in README
...
Upstream-commit: 37c20fa64b7fc8156d51e08f9271fe3dafda5c19
Component: engine
2013-06-10 19:03:54 +03:00
5a4574b8be
fix errors when no body
...
Upstream-commit: ab0d0a28a8085255558b5ee7be978d667f44def9
Component: engine
2013-06-10 15:06:52 +00:00
cdea6dbd60
Add Access-Control-Allow-Methods header
...
Add the Access-Control-Allow-Methods header so that
DELETE operations are allowed.
Also move the write CORS headers method before
docker writes a 404 not found so that the client
receives the correct response and not an invalid
CORS request.
Upstream-commit: 393e873d25093f579d1a293bc473007b04f3c239
Component: engine
2013-06-09 17:17:35 -09:00
a1c85f2f28
Merge pull request #855 from samjsharpe/fix_missing_hyphen
...
Build from Dockerfile on stdin requires a hyphen
Upstream-commit: 956491f8534692f7e31cd4678b688678d6256414
Component: engine
2013-06-07 13:04:27 -07:00
f164baea45
Build from Dockerfile on stdin requires a hypen
...
There is a missing hypen in the documentation:
`docker build < Dockerfile` will complain
`docker build - < Dockerfile` will not complain
Upstream-commit: 5e6cd21f8b3bded9e9cba2e1b9a754df5a9c2bf2
Component: engine
2013-06-07 20:35:34 +01:00
f6b73ea991
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 968e08a9babaeb13ae342da8e966c87e96b42e8a
Component: engine
2013-06-07 02:41:08 +02:00
baad17669e
Typo in MAINTAINERS file
...
Upstream-commit: 56473d4cce79b0f06e46d88d14c716c1858188e2
Component: engine
2013-06-06 22:52:55 +02:00
f485f9f4c0
Update README.md
...
Upstream-commit: da937bf214d781af9c3eb955e1b33e78359892e2
Component: engine
2013-06-06 11:09:11 -06:00
0c23e5a2a9
Daniel Mizyrycki is maintainer of dockerbuilder, the official build environment for docker binary releases
...
Upstream-commit: 42b63eb81884d6e6b1dc325397195cffd880f493
Component: engine
2013-06-06 19:06:54 +02:00
cfd63a0293
docker-build contrib script is deprecated by the new 'build' command
...
Upstream-commit: 0d6db333d6b4944a228848a9f451d6a647324b40
Component: engine
2013-06-06 19:05:21 +02:00
075d1e6e0c
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 3999465c8569938cf859b24ea2bdd763fe1f3ceb
Component: engine
2013-06-06 19:04:17 +02:00
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
11abae76ab
changed to 12.04 and add kernel
...
Upstream-commit: a118ad90edbb232806345c4038f3e9e68098648c
Component: engine
2013-06-06 12:36:28 +00:00
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
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
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
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
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
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
28f01e9e4d
update doc to newer go
...
Upstream-commit: e3cc625315ffdc47e6ea8d94812c7423853435b8
Component: engine
2013-06-05 13:19:49 +00:00
e1f455fc5a
bump to master
...
Upstream-commit: b4682e6707301b650f041b877db0ea0053a9b340
Component: engine
2013-06-05 10:19:51 +00:00
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
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
82ddfc6a07
Put back panic for go1.0.3 compatibility
...
Upstream-commit: 7ef9833dbb299ebf796092a6921127ea77d38337
Component: engine
2013-06-04 14:26:40 -07:00
2dea62a6a6
Merge pull request #808 from dotcloud/795-lintify
...
Cleanup source
Upstream-commit: c1ee9bf8817980c4577f914c0bc7b532f4b3000c
Component: engine
2013-06-04 14:20:38 -07:00
2fdc41e83d
Remove provider specifc language
...
Upstream-commit: c000ef194c0259bfe631222b19a2bc204281f836
Component: engine
2013-06-04 16:01:38 -04:00
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
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
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
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
0b2167b3b8
fix progress message in client
...
Upstream-commit: 3922691fb99a99cec0a5d239da522cc3d8778e6c
Component: engine
2013-06-04 16:09:08 +00:00
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
