microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
4 834 коммитов 243 Ветки 83 Теги 224 MiB
Граф коммитов

265 Коммитов

Автор SHA1 Сообщение Дата
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
Guillaume J. Charmes 54db18625a Add Extension() method to Compresison type 2013-05-28 13:37:49 -07:00
Victor Vieux e5fa4a4956 return 404 on no such containers in /attach 2013-05-28 16:19:12 +00:00
Victor Vieux 4f9443927e rename containers/ps to containers/json 2013-05-28 16:08:05 +00:00
Victor Vieux 5a36efb61f fix json encoding, and use less casts 2013-05-26 23:45:45 +00:00
Victor Vieux c8c7094b2e imporved error, push, import insert 2013-05-25 15:09:46 +00:00
Victor Vieux cb0bc4adc2 add error handling 2013-05-25 14:12:02 +00:00
Solomon Hykes 9775f0bd14 * Remote API: send push/pull progress bar as json 2013-05-24 17:59:27 -07:00
Guillaume J. Charmes ffd9e06deb Merge branch 'master' into tty_resize 
Conflicts:
	commands.go
 2013-05-24 14:45:31 -07:00
Guillaume J. Charmes a3293ed854 Fix merge issue 2013-05-24 11:56:21 -07:00
Victor Vieux 3c7bca7a21 first version of Pull 2013-05-24 16:34:03 +00:00
Victor Vieux 1f23b4caae fix docker login when same username 2013-05-24 14:23:43 +00:00
Guillaume J. Charmes 70d2123efd Add resize endpoint to api 2013-05-23 19:33:28 -07:00
Guillaume J. Charmes 2cd00a47a5 remove unused function 2013-05-23 18:34:38 -07:00
Guillaume J. Charmes d42c10aa09 Implement Context within docker build (not yet in use) 2013-05-23 18:32:56 -07:00
Victor Vieux cf35e8ed81 jsonstream WIP 2013-05-23 15:16:35 +00:00
Guillaume J. Charmes 0f135ad7f3 Start moving the docker builder into the server 2013-05-22 20:07:26 -07:00
Victor Vieux faae7220c0 api versionning 2013-05-22 15:29:54 +00:00
Guillaume J. Charmes 0d2fb29537 Merge fix 2013-05-20 16:21:35 -07:00
Guillaume J. Charmes c2a14bb196 Add "Cmd" prefix to builder instructions 2013-05-20 12:09:15 -07:00
Victor Vieux 67b20f2c8c add check to see if the image isn't parent of another and add -f to force 2013-05-20 18:31:45 +00:00
Guillaume J. Charmes 0f312113d3 Move docker build to client 2013-05-19 10:46:24 -07:00
Guillaume J. Charmes f29e5dc8a1 Remove hijack from api when not necessary 2013-05-16 12:09:06 -07:00
Victor Vieux 0c5443571d 1 or 0 -> 1/True/true or 0/False/false 2013-05-16 13:45:29 +00:00
Guillaume J. Charmes fef816163c Merge pull request #618 from titanous/cleanup 
Misc. cleanup
 2013-05-15 18:05:31 -07:00
Guillaume J. Charmes 10e19e4b97 Update tests to reflect new AuthConfig 2013-05-15 17:31:11 -07:00
Guillaume J. Charmes 95dd6d31a4 Move authConfig from runtime to registry 2013-05-15 17:17:33 -07:00
Guillaume J. Charmes bb85ce9aff Allow to change login 2013-05-15 13:39:24 -07:00
Jonathan Rudenberg 52ef89f9c2 Fix mistaken call to fmt.Println 2013-05-15 15:52:19 -04:00
Guillaume J. Charmes 2f4de3867d Reenable docker push 2013-05-15 19:21:37 +00:00
Guillaume J. Charmes 9bb3dc9843 Split registry into subpackage 2013-05-15 01:41:39 +00:00
Guillaume J. Charmes 2e69e1727b Create a subpackage for utils 2013-05-14 22:37:35 +00:00
Guillaume J. Charmes 37b80325d0 Merge pull request #593 from dotcloud/579-move_display_options_to_client-feature 
* Api: Move display options to client
 2013-05-13 11:40:46 -07:00
Guillaume J. Charmes 02d255457a Merge pull request #591 from dotcloud/590_error_message-fix 
Fix error message in export
 2013-05-13 10:58:05 -07:00
Victor Vieux 182842e3c3 fix error push 2013-05-13 19:19:27 +02:00
Victor Vieux 1990c49a62 removed only_ids and trunc_cmd from the api 2013-05-13 12:18:55 +02:00
Victor Vieux 8b31d30601 fix error message in export 2013-05-13 11:39:24 +02:00
Victor Vieux f7beba3acc add writeJson 2013-05-10 15:10:15 -07:00
Victor Vieux 7cc082347f refactor api.go 2013-05-10 15:10:15 -07:00
Guillaume J. Charmes 5bec9275c0 Improve remote api unit tests 2013-05-10 12:28:07 -07:00
Guillaume J. Charmes 1941c79195 make commands use the correct routes 2013-05-09 22:28:52 -07:00
Guillaume J. Charmes eeaea4e873 Update the routes within commands.go 2013-05-09 20:19:21 -07:00
Guillaume J. Charmes 24816a8b80 Add/improve unit tests 2013-05-09 20:13:52 -07:00
Guillaume J. Charmes 0c6380cc32 Rename "v" in "removeVolume" 2013-05-09 19:19:55 -07:00
Guillaume J. Charmes 2a303dab85 Add unit tests 2013-05-09 19:19:24 -07:00
Guillaume J. Charmes 152ebeea43 Change API route for containers/ and images/ in order to avoid conflict 2013-05-09 17:50:56 -07:00
Guillaume J. Charmes ff67da9c86 Add the variable maps to the Api functions 2013-05-09 16:28:47 -07:00
Victor Vieux c423a790d6 fixed issue with viz 2013-05-09 23:52:12 +02:00
Victor Vieux 93dc2c331e removed hijack in export 2013-05-09 23:28:03 +02:00
Victor Vieux 0ecf5e245d removed hijack on viz 2013-05-09 23:10:26 +02:00
Victor Vieux 0862183c86 fix status code and error detection 2013-05-09 21:42:29 +02:00
Victor Vieux 7c7619ecf8 display warning on the server in debug in version don't match 2013-05-09 20:24:49 +02:00
Victor Vieux 24c785bc06 fix login 2013-05-08 23:57:14 +02:00
Victor Vieux 1d42cbaa21 removed useless returns 2013-05-08 23:19:24 +02:00
Victor Vieux bf605fcfc7 fix commit without run parameter 2013-05-08 19:21:52 +02:00
Victor Vieux 954ecac388 fix doc and empty content-type 2013-05-08 18:52:01 +02:00
Victor Vieux 4a1e0d321e change content-type and small fix in run 2013-05-08 18:36:37 +02:00
Victor Vieux bc3fa506e9 added pagination on ps 2013-05-08 18:28:11 +02:00
Victor Vieux 075e1ebb0e remove useless port endpoint 2013-05-08 18:06:43 +02:00
Victor Vieux 60ddcaa15d changes 2 endpoints to avoid confusion, changed some parameters, fix doc, add api unit tests 2013-05-08 17:35:50 +02:00
Guillaume J. Charmes cacc7e564a Fix non exiting client issue 2013-05-07 23:32:17 -07:00
Guillaume J. Charmes 2ac4e662f1 Small fix 2013-05-07 18:16:24 -07:00
Guillaume J. Charmes 57cfe72e8c Replace os.File with io.ReadCloser and io.Writer 2013-05-07 18:06:49 -07:00
Guillaume J. Charmes 755604a2bd Fix routes in api.go 2013-05-07 17:35:33 -07:00
Guillaume J. Charmes 891c5202ea Factorize api.go 2013-05-07 17:27:09 -07:00
Guillaume J. Charmes ab96da8eb2 Use bool instead of string for flags 2013-05-07 16:47:43 -07:00
Guillaume J. Charmes 279db68b46 Use Fprintf instead of Fprintln 2013-05-07 16:36:49 -07:00
Guillaume J. Charmes b56b2da5c5 Refactor api.go to use a factory with named functions 2013-05-07 16:33:12 -07:00
Victor Vieux 4079411375 fix run no parameter 2013-05-07 20:59:04 +02:00
Victor Vieux 59a6316f5e added search 2013-05-07 20:43:31 +02:00
Victor Vieux 10c0e99037 update to master 2013-05-07 19:23:50 +02:00
Victor Vieux 0b6c79b303 first draft of the doc, split commit and fix some issues in spi.go 2013-05-07 17:19:41 +02:00
Victor Vieux f37399d22b added login and push 2013-05-06 13:34:31 +02:00
Victor Vieux 6f9b574f25 bump to 0.2.2 2013-05-06 11:53:00 +02:00
Victor Vieux 04cd20fa62 split api and server. run return exit code. import, pull and commit uses the smae endpoint. non zero status code on failure 2013-05-06 11:31:22 +02:00
Victor Vieux 4f0bda2dd5 up to date with master 2013-05-02 18:36:23 +02:00