Commit Graph
1796 Commits
Author SHA1 Message Date
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
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
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
Daniel Gasienica a432f97e17 Add link at the beginning
Upstream-commit: 464765b940c8194c302b89891dc06b8fcc1b37ff
Component: engine
2013-06-01 22:16:26 -07:00
Daniel Gasienica 409c1d534a Add Node.js web app example using CentOS
Upstream-commit: e9ffc1e49998d42f37b39cd23b56b73f7dc0e3da
Component: engine
2013-06-01 22:06:53 -07:00
Daniel Gasienica 657224f8b4 Use code blocks
Upstream-commit: 4fb9a6eafb981ed66fe547fe29c11525f40d0640
Component: engine
2013-06-01 22:03:41 -07:00
Daniel Gasienica a6d08b401d Name examples consistently
Upstream-commit: 157547845acd8a0633df72e01d22bad9cbec578b
Component: engine
2013-06-01 22:03:28 -07:00
Daniel Gasienica 74278bf53f Use title case for consistency
Upstream-commit: 2935ca7ee2879723c786b86ee87cc1be26dad7b8
Component: engine
2013-06-01 22:03:12 -07:00
Daniel Gasienica 445dfaf8b1 Use em dash in title
Upstream-commit: 23452f1573e7887b638a4e69a4cf90d757921885
Component: engine
2013-06-01 22:02:24 -07:00
Daniel Gasienica aee770cf4d Fix typo
Upstream-commit: f6f345b1fe0ecc1adba449b0078d96388dd48892
Component: engine
2013-06-01 21:55:01 -07:00
Daniel Gasienica cf5d33839b Add more tags
Upstream-commit: e3fd61ad74521b1a94502cf8dcc7c450f035c168
Component: engine
2013-06-01 21:27:27 -07:00
Daniel Gasienica 4902d73b72 Make style consistent
Upstream-commit: 01ce63aacdd975130244f4be70bc90736e85d457
Component: engine
2013-06-01 21:26:58 -07:00
Daniel Gasienica fef5363d7d Add Mac OS X instructions for doc tools
Upstream-commit: 3ca9c11110ff5068fd453a3e8aa0b39ee26d363c
Component: engine
2013-06-01 21:26:18 -07:00
Daniel Gasienica 76d5aac68b Add make server command to preview docs
Upstream-commit: b4df0b17afef027e88f0536cbfc9518e04f62eec
Component: engine
2013-06-01 21:25:51 -07:00
Jon Wedaman 2fce4aa919 Spelling correction in docs
Upstream-commit: 7f65bf508e5930df48e3e3de2ed9a5a62a66446c
Component: engine
2013-06-01 21:48:32 -04:00
Guillaume J. Charmes a2376ec542 Move Termios struct to os specific file
Upstream-commit: a70dd65964340b5c4ccedf497a2605b13e7ac8a8
Component: engine
2013-06-01 16:19:50 -07:00
Guillaume J. Charmes 5d91e53bfc Remove unused constants
Upstream-commit: 3cc0963ad16a5abd67aeba22cefac34a40ac70ef
Component: engine
2013-06-01 15:55:52 -07:00
Guillaume J. Charmes b1b9c35361 Use uintptr instead of int for Fd
Upstream-commit: 31eb01ae8aac22a4d768418d3cc4da6f903a8694
Component: engine
2013-06-01 15:55:05 -07:00
Guillaume J. Charmes e8aac5c357 Remove cgo from term
Upstream-commit: 64f346779fbe4ba9587ec65eedd0e8373f7e29c0
Component: engine
2013-06-01 15:51:45 -07:00
Guillaume J. Charmes e4ed4aec41 Merge pull request #777 from dotcloud/bsdtar-env
Pass a guaranteed environment to bsdtar for predictable behaviour
Upstream-commit: 078a19d7255a7f9f50c4071a6b0811f4a996bd3e
Component: engine
2013-06-01 11:28:55 -07:00
Solomon Hykes ca771dfaab * Runtime: pass a guaranteed environment to bsdtar for predictable behavior without depending on the underlying host configuration.
Upstream-commit: 561ceac55d5821a00258934cf9dc215278e3ecfd
Component: engine
2013-05-31 22:25:48 -07:00
Guillaume J. Charmes 5fd52ed23e Merge pull request #707 from unclejack/411-add-arch-field
411 add architecture field
Upstream-commit: a373c770b63982674e24704789f80e0ce15bb55d
Component: engine
2013-05-31 17:26:11 -07:00
Solomon Hykes 98ee8979da Merge pull request #762 from dotcloud/761-packaging-dockerbuilder
Packaging: Ensure dockerbuilder can build docker PPA
Upstream-commit: 90b8c5ce67f5070c8f3d6eb8135cd17d82411121
Component: engine
2013-05-31 16:28:44 -07:00
Guillaume J. Charmes 934fcbd514 Merge pull request #719 from dotcloud/json_stream-feature
* API: push, pull, import, insert -> Json Stream
Upstream-commit: 9bc71c101c8f1299427013bfb5503bf85173c28f
Component: engine
2013-05-31 16:05:15 -07:00
Guillaume J. Charmes 4c4d21a4a1 Update api docs
Upstream-commit: f41d2ec4d91f2fa1dc479d8bac32113fbb7e987e
Component: engine
2013-05-31 15:56:30 -07:00
Guillaume J. Charmes 37b218faec Improve the docker version and docker info commands
Upstream-commit: 1dae7a25b919dc70798cbab8107809690212cd69
Component: engine
2013-05-31 15:53:57 -07:00
Daniel Mizyrycki 6c880d5b85 Merge pull request #533 from tianon/mkimage-debian
Update mkimage-debian.sh now that wheezy is officially the stable release
MD: Ref issue #447
Upstream-commit: 926c1d45aa3fbf86d63d20d4df5bf91b36bc2382
Component: engine
2013-05-31 14:53:37 -07:00