f1b51af018
*Builder: warn pre-1.3 clients that they need to upgrade. This breaks semver, but our API should still be in 0.X versioning, in which case semver allows breaking changes.
...
Upstream-commit: 90dde9beabcac3874a274f9f7952f25ba8c1c7a3
Component: engine
2013-06-19 14:59:28 -07:00
4bba5db0ac
* Builder: simplify the upload of the build context. Simply stream a tarball instead of multipart upload with 4 intermediary buffers. Simpler, less memory usage, less disk usage, and faster.
...
Upstream-commit: 38554fc2a722d1a77514f477a189b0dbd149691b
Component: engine
2013-06-15 09:38:18 -07:00
40bdb17b30
Remove duplicate 'WARNING'
...
Upstream-commit: 7f118519eb007b2423fff428aceddabd6c1c301d
Component: engine
2013-06-14 14:46:08 -07:00
54b69da177
Merge branch 'dns_server_side'
...
+ Configure dns configuration host-wide with 'docker -d -dns'
+ Detect faulty DNS configuration and replace it with a public default
Upstream-commit: 250e47e2eb12015fd436a9b695c50cc2fbfb3fdc
Component: engine
2013-06-14 14:39:05 -07:00
4147a474f5
rebase master
...
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
9efccead8d
Merge branch '610-improve_rmi-feature'
...
* Runtime: improved image removal to garbage-collect unreferenced parents
- Runtime: fixed image removal to cleanly remove tags and repositories
Upstream-commit: 5ecfe13be9f8f47e27e5134e60d14d195a1baeaa
Component: engine
2013-06-12 20:30:07 -07:00
0a236e493a
bump to master
...
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +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
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
2bcee3140c
rebump
...
Upstream-commit: 66d9a733622ba9a8f9671bac7d33776981672940
Component: engine
2013-06-10 21:05:54 +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
0828523946
Check for local dns server and output a warning
...
Upstream-commit: a3f6054f974909458c9e820842310987e225b767
Component: engine
2013-06-06 11:01:09 -07:00
83d9b24a84
bump to master
...
Upstream-commit: c906239220c7ba06b8615f001fab2f42fb063aeb
Component: engine
2013-06-05 10:23:45 +00:00
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
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
db19220e91
removed auth in pull
...
Upstream-commit: 7e59b83053bceb683a198786290bc61da81581be
Component: engine
2013-06-03 17:51:52 +00:00
a5e3ae8f4a
bump master
...
Upstream-commit: ca902b6be4cb04f3f885af750609f74effd75d3d
Component: engine
2013-06-03 12:37:51 +00:00
f6d51d4fe0
added docs and moved to api version 1.2
...
Upstream-commit: 3dd1e4d58c9d676d49f41db450c3d42901526edc
Component: engine
2013-06-03 12:09:16 +00:00
5a833bafbe
bump to master
...
Upstream-commit: 62c78696cda5660524dee596a07aac66d89437af
Component: engine
2013-06-03 11:06:13 +00:00
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
3efe0a345b
returns an error if the container we want to attach is not running
...
Upstream-commit: 468e4c4b565d25b03c68ce2ab31f9a52f7b3398a
Component: engine
2013-05-31 15:34:23 +00:00
799ca20158
added proper returns type, move the auto-prune in v1.1 api
...
Upstream-commit: 9060b5c2f52d29dec1920eb89ee0d48341540e3b
Component: engine
2013-05-31 14:37:02 +00:00
0319ab95bb
Add -t to docker build in order to tag resulting image
...
Upstream-commit: 56431d3130f8a48cfb708509cbe39682f7fe841c
Component: engine
2013-05-30 12:08:21 -07:00
167d529e1c
ensure progress downloader is well formated
...
Upstream-commit: cd002a4d162aa273cd9e646e6fd124ef2b6f6944
Component: engine
2013-05-30 17:00:42 +00:00
e8420b7464
move auth to the client WIP
...
Upstream-commit: 49e656839fb3d846dc65fec544f2984a9c72a2cf
Component: engine
2013-05-30 15:39:43 +00:00
694903e92c
removed the -f
...
Upstream-commit: 2eb4e2a0b86f8d244f0b6cbeb0422f8499d834f8
Component: engine
2013-05-29 16:31:47 +00:00
f8799691fc
Merge pull request #739 from dotcloud/push_issue-1
...
- Registry: Cereate a new registry object for each request (~session)
Upstream-commit: 08e5f1295487f2c06639bc8ac97be35f30359534
Component: engine
2013-05-29 09:22:12 -07:00
06534c45f7
bump to master
...
Upstream-commit: f339fc2eb921986749a628b92d2c9f2ecf47e3c2
Component: engine
2013-05-29 13:52:18 +00:00
9c8c6a4ab3
merge master
...
Upstream-commit: ea9095c5626077c198e3fdbb480d6205851f027b
Component: engine
2013-05-29 11:49:39 +00:00
a7da07b831
+ Runtime: stable implementation of 'docker build'
...
Upstream-commit: c7985808aea860d220ad8827cd21b042adef7934
Component: engine
2013-05-28 19:40:38 -07:00
f9738020b7
Update tests with new cookies for registry
...
Upstream-commit: b76d6120ac66a853d177f7e53318ab1ee75dca92
Component: engine
2013-05-28 17:35:10 -07:00
cbc5080648
Cereate a new registry object for each request (~session)
...
Upstream-commit: cd0de83917e775fcdcd3ce4e592b627b7eeeac64
Component: engine
2013-05-28 17:12:24 -07:00
1e4dfca884
Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
...
* API: rename containers/ps to containers/json
Upstream-commit: f65327555e00dcfb2691e8a2df1c57cb011a0898
Component: engine
2013-05-28 15:44:20 -07:00
57ef7f3ad5
Send error without headers when using chunks
...
Upstream-commit: fe0c0c208c0e816419b668a6fd6567520698c2d2
Component: engine
2013-05-28 15:21:06 -07:00
288bdc86e5
Make docker build flush output each line
...
Upstream-commit: 582a9e0a67598672db35ef26a18027dd6fb222ca
Component: engine
2013-05-28 13:47:04 -07:00
20562fdb8c
Fix merge issue
...
Upstream-commit: a48799016a43e6badae72e855f9a90592b6cdd98
Component: engine
2013-05-28 13:46:52 -07:00
d21f15c6b9
Merge master
...
Upstream-commit: dce82bc85615ca09c999bc2186c2c9caf348dc33
Component: engine
2013-05-28 13:42:50 -07:00
ef0eab1820
Add Extension() method to Compresison type
...
Upstream-commit: 54db18625aa7154c9dd230907444676fa3079b99
Component: engine
2013-05-28 13:37:49 -07:00
b292d69f2b
return 404 on no such containers in /attach
...
Upstream-commit: e5fa4a4956393afc473539710e2a4b7297eb6ebf
Component: engine
2013-05-28 16:19:12 +00:00
a20c31a039
rename containers/ps to containers/json
...
Upstream-commit: 4f9443927e8bc8a724b43afae6cf7a183cd9acd0
Component: engine
2013-05-28 16:08:05 +00:00
037b9b6160
fix json encoding, and use less casts
...
Upstream-commit: 5a36efb61fae88a7fe71f67a6b1f8b9da6468014
Component: engine
2013-05-26 23:45:45 +00:00
04ca200a24
imporved error, push, import insert
...
Upstream-commit: c8c7094b2e8088210e2182e582264e09222c6e3d
Component: engine
2013-05-25 15:09:46 +00:00
7a922259e1
add error handling
...
Upstream-commit: cb0bc4adc297baeea8e7b74269765c35457e04e7
Component: engine
2013-05-25 14:12:02 +00:00
d6fea566f0
* Remote API: send push/pull progress bar as json
...
Upstream-commit: 9775f0bd145c607126ea22a17b291dea822be7b2
Component: engine
2013-05-24 17:59:27 -07:00
8e3c67a46e
Merge branch 'master' into tty_resize
...
Conflicts:
commands.go
Upstream-commit: ffd9e06deb9d222ac5e1f63734211c0503213e06
Component: engine
2013-05-24 14:45:31 -07:00
d66839e06f
Fix merge issue
...
Upstream-commit: a3293ed854675074d7f5d5c2bca63ba9fa599deb
Component: engine
2013-05-24 11:56:21 -07:00
10117596bb
first version of Pull
...
Upstream-commit: 3c7bca7a215f9a44af4d6e026a6e8b230d808a83
Component: engine
2013-05-24 16:34:03 +00:00
bad97e351a
fix docker login when same username
...
Upstream-commit: 1f23b4caae6cd60a2bc1911c17fcebcadc539497
Component: engine
2013-05-24 14:23:43 +00:00
