benoitc
e2ca600fd8
Merge branch 'feature/attach_ws' into feature/attach_ws2
...
Conflicts:
api.go
2013-08-07 23:30:28 +02:00
Michael Crosby
d94b186080
Strip leading forward slash from resource
2013-08-06 16:09:54 +00:00
Michael Crosby
5b8cfbe15c
Add cp command and copy api endpoint
...
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.
Closes #382
2013-08-06 16:09:54 +00:00
Michael Crosby
754ed9043d
Use mime types to parse Content-Type
2013-08-06 15:57:13 +00:00
Michael Crosby
8934f13615
Change daemon to listen on unix socket by default
2013-08-06 00:12:56 +00:00
Victor Vieux
946bbee39a
rebase master
2013-08-05 16:25:42 +00:00
Victor Vieux
feda3db1dd
Merge pull request #1382 from monnand/650-http-utils
...
650 http utils and user agent field
2013-08-05 08:49:12 -07:00
Guillaume J. Charmes
3e9575e275
Consider empty /etc/resolv.conf as local dns + add unit test
2013-08-02 15:23:36 -07:00
Michael Crosby
3a123bc479
Add no cache for docker build
...
Add a new flag to disable the image cache when building images.
2013-08-02 16:18:54 +00:00
Nan Monnand Deng
4bd287e107
auth with user agent
2013-08-02 03:30:45 -04:00
Victor Vieux
0c0077ed6f
Merge pull request #1328 from dotcloud/1307_url_port_delete-fix
...
Use utils.ParseRepositoryTag instead of strings.Split(name, ":") in server.ImageDelete
2013-07-31 07:55:06 -07:00
Victor Vieux
a7068510a5
fix same issue in api.go
2013-07-31 08:01:20 +00:00
Victor Vieux
46f59dd933
add parallel pull to 1.4
2013-07-30 12:15:33 +00:00
Victor Vieux
0b57e4483a
Merge branch 'master' into 1237-improve_docker_top-feature
2013-07-30 11:51:16 +00:00
Victor Vieux
f4b41e1a6c
fix tests
2013-07-24 12:28:22 +00:00
Victor Vieux
4bc3328e80
bump master
2013-07-24 12:18:53 +00:00
Victor Vieux
8b3519c5f7
getEvents a bit simpler
2013-07-23 15:42:34 +00:00
Victor Vieux
2e4d4c9f60
add since for polling, rename some vars
2013-07-23 15:41:19 +00:00
Victor Vieux
b5da816487
basic version of the /events endpoint
2013-07-23 15:41:19 +00:00
Victor Vieux
3bae188b8d
change dockercfg to json and support multiple auth remote
2013-07-23 15:07:18 +00:00
Victor Vieux
eb4a0271fb
bump api version to 1.4
2013-07-19 10:34:55 +00:00
Victor Vieux
cfec1c3e1b
add ps args to docker top
2013-07-19 10:06:32 +00:00
Guillaume J. Charmes
de563a3ea3
Merge pull request #1194 from crosbymichael/build-verbose
...
* Builder: Add verbose output to docker build
2013-07-17 12:53:06 -07:00
benoitc
d639f61ec1
reuse the type
2013-07-13 19:19:38 +02:00
Victor Vieux
50e45b485f
Merge pull request #1190 from dotcloud/1189-add_debug_error
...
* RemoteAPI: Improve debug
2013-07-13 08:15:59 -07:00
benoitc
a3b1a9f01a
useless function. forgot to remove it.
2013-07-13 17:04:04 +02:00
benoitc
507cef8bce
useless type
2013-07-13 17:03:04 +02:00
benoitc
166eba3e28
put the websocket route in the map containing all routes
...
Instead of handling the websocket differently just handle it as a normal
route and upgrade it to a websocket.
2013-07-13 17:00:40 +02:00
Victor Vieux
9232d1ef62
Merge branch 'master' into list_container_processes-feature
2013-07-12 11:47:27 +00:00
Michael Crosby
474191dd7b
Add verbose output to docker build
...
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
2013-07-11 15:27:33 -09:00
Victor Vieux
b7937e268f
add debug for error in the server
2013-07-11 12:21:43 +00:00
Victor Vieux
a0f5fb7394
add remote addr in debug
2013-07-08 12:45:50 +00:00
benoitc
8eeff01939
add websocket support to /container/<name>/attach/ws
...
This function add the possibility to attach containers streams to a
websocket. When a websocket is asked the request is upgraded to this
protocol..
2013-07-06 02:05:02 +02:00
Sam Alba
be49f0a118
Merging from master
2013-07-05 12:27:10 -07:00
Sam Alba
66a9d06d9f
Adding support for nicer URLs to support standalone registry (+ some registry code cleaning)
2013-07-05 12:20:58 -07:00
Caleb Spare
1277dca335
Style fixes for fmt + err usage.
...
fmt.Printf and friends will automatically format using the error
interface (.Error()) preferentially; no need to do err.Error().
2013-07-04 14:33:17 -07:00
Victor Vieux
d1d66b9c5f
Merge pull request #1078 from kstaken/fix_json_error
...
* Remote API: Small fix in /start if empty host config
2013-07-01 16:36:58 -07:00
Victor Vieux
11e28842ac
change to top
2013-07-01 15:19:42 +00:00
Kimbro Staken
d8d33e8b8b
Adding check for content-type header
2013-06-30 10:46:09 -07:00
Johan Euphrosine
54da339b2c
api,server: slice are already refs, no need to return ptr
2013-06-28 12:41:09 -07:00
Victor Vieux
2e79719622
add /proc to list running processes inside a container
2013-06-28 15:51:58 +00:00
Gabriel Monroy
4fdf11b2e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
2013-06-26 15:07:31 -07:00
Guillaume J. Charmes
5190f7f33a
Implement regression test for stdin attach
2013-06-24 18:36:04 -07:00
Victor Vieux
4d1692726b
merge master and add doc
2013-06-22 01:08:20 +02:00
Victor Vieux
1581ed52ba
consistent codebase fix
2013-06-21 22:55:33 +00:00
Guillaume J. Charmes
de1a5a75cc
Merge pull request #848 from dotcloud/builder_server-3
...
Improve Docker build
2013-06-21 14:55:08 -07:00
Victor Vieux
8f2a80804c
Merge branch 'master' into fix-auth
2013-06-21 09:18:03 +00:00
Victor Vieux
5b3ad0023b
inverse if
2013-06-21 09:06:09 +00:00
Solomon Hykes
d9bce2defd
- Builder: return an error when the build fails
2013-06-20 22:15:19 -07:00
Solomon Hykes
352991bdf4
Merge branch 'simpler-build-upload' ( #900 ) into builder_server-3 ( #848 )
2013-06-20 22:02:36 -07:00
Solomon Hykes
86e83186b5
Merge branch 'master' into simpler-build-upload
...
Conflicts:
commands.go
2013-06-20 20:25:59 -07:00
Guillaume J. Charmes
b419699ab8
Use hijack for logs instead of stream
2013-06-20 18:18:36 -07:00
Solomon Hykes
e43323221b
Merge branch 'master' into simpler-build-upload
...
Conflicts:
api.go
builder_client.go
commands.go
2013-06-20 14:19:09 -07:00
Victor Vieux
da199846d2
use strconv.ParseBool in getBoolParam
2013-06-20 14:34:58 +00:00
Victor Vieux
bd04d7d475
add ps -s
2013-06-20 14:19:50 +00:00
Solomon Hykes
90dde9beab
*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.
2013-06-19 14:59:28 -07:00
Victor Vieux
3adf9ce04e
add basic support for unix sockets
2013-06-18 18:59:56 +00:00
Solomon Hykes
38554fc2a7
* 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.
2013-06-15 09:38:18 -07:00
Guillaume J. Charmes
78f86ea502
Merge branch 'master' into builder_server-3
...
Conflicts:
utils/utils.go
2013-06-14 17:08:39 -07:00
Solomon Hykes
7f118519eb
Remove duplicate 'WARNING'
2013-06-14 14:46:08 -07:00
Solomon Hykes
250e47e2eb
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
2013-06-14 14:39:05 -07:00
Victor Vieux
90f6bdd6e4
update docs, remove config file on 401
2013-06-14 13:38:51 +00:00
Guillaume J. Charmes
4b4918f2a7
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile.go
commands.go
docs/sources/api/docker_remote_api.rst
2013-06-13 18:11:22 -07:00
Victor Vieux
c46382ba29
rebase master
2013-06-13 17:58:06 +00:00
Solomon Hykes
5ecfe13be9
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
2013-06-12 20:30:07 -07:00
Victor Vieux
f2383151cb
bump to master
2013-06-12 17:39:32 +00:00
Victor Vieux
20bf0e00e8
* Remote Api: Add flag to enable cross domain requests
2013-06-11 10:12:36 +00:00
Michael Crosby
dd53c457d7
Add OPTIONS to route map
...
Move the OPTIONS method registration into the existing
route map. Also add support for empty paths in
the map.
2013-06-10 16:10:40 -09:00
Michael Crosby
ac599d6528
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.
2013-06-10 14:44:10 -09:00
Michael Crosby
0a28628c02
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.
2013-06-10 13:02:40 -09:00
Victor Vieux
66d9a73362
rebump
2013-06-10 21:05:54 +00:00
Michael Crosby
393e873d25
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.
2013-06-09 17:17:35 -09:00
Guillaume J. Charmes
12c9b9b3c9
Implement build from git
2013-06-06 16:41:41 -07:00
Guillaume J. Charmes
a11e61677c
Move the docker build URL form client to server, prepare for GIT support
2013-06-06 16:09:46 -07:00
Guillaume J. Charmes
a3f6054f97
Check for local dns server and output a warning
2013-06-06 11:01:09 -07:00
Victor Vieux
c906239220
bump to master
2013-06-05 10:23:45 +00:00
Victor Vieux
fd224ee590
linted names
2013-06-04 18:00:22 +00:00
Michael Crosby
6d5bdff394
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.
2013-06-03 21:39:00 -04:00
Victor Vieux
7e59b83053
removed auth in pull
2013-06-03 17:51:52 +00:00
Victor Vieux
ca902b6be4
bump master
2013-06-03 12:37:51 +00:00
Victor Vieux
3dd1e4d58c
added docs and moved to api version 1.2
2013-06-03 12:09:16 +00:00
Victor Vieux
62c78696cd
bump to master
2013-06-03 11:06:13 +00:00
Guillaume J. Charmes
9bc71c101c
Merge pull request #719 from dotcloud/json_stream-feature
...
* API: push, pull, import, insert -> Json Stream
2013-05-31 16:05:15 -07:00
Victor Vieux
468e4c4b56
returns an error if the container we want to attach is not running
2013-05-31 15:34:23 +00:00
Victor Vieux
9060b5c2f5
added proper returns type, move the auto-prune in v1.1 api
2013-05-31 14:37:02 +00:00
Guillaume J. Charmes
56431d3130
Add -t to docker build in order to tag resulting image
2013-05-30 12:08:21 -07:00
Victor Vieux
cd002a4d16
ensure progress downloader is well formated
2013-05-30 17:00:42 +00:00
Victor Vieux
49e656839f
move auth to the client WIP
2013-05-30 15:39:43 +00:00
Victor Vieux
2eb4e2a0b8
removed the -f
2013-05-29 16:31:47 +00:00
Guillaume J. Charmes
08e5f12954
Merge pull request #739 from dotcloud/push_issue-1
...
- Registry: Cereate a new registry object for each request (~session)
2013-05-29 09:22:12 -07:00
Victor Vieux
f339fc2eb9
bump to master
2013-05-29 13:52:18 +00:00
Victor Vieux
ea9095c562
merge master
2013-05-29 11:49:39 +00:00
Solomon Hykes
c7985808ae
+ Runtime: stable implementation of 'docker build'
2013-05-28 19:40:38 -07:00
Guillaume J. Charmes
b76d6120ac
Update tests with new cookies for registry
2013-05-28 17:35:10 -07:00
Guillaume J. Charmes
cd0de83917
Cereate a new registry object for each request (~session)
2013-05-28 17:12:24 -07:00
Guillaume J. Charmes
f65327555e
Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
...
* API: rename containers/ps to containers/json
2013-05-28 15:44:20 -07:00
Guillaume J. Charmes
fe0c0c208c
Send error without headers when using chunks
2013-05-28 15:21:06 -07:00
Guillaume J. Charmes
582a9e0a67
Make docker build flush output each line
2013-05-28 13:47:04 -07:00
Guillaume J. Charmes
a48799016a
Fix merge issue
2013-05-28 13:46:52 -07:00
Guillaume J. Charmes
dce82bc856
Merge master
2013-05-28 13:42:50 -07:00