4e2ad07ebe
Merge pull request #1190 from dotcloud/1189-add_debug_error
...
* RemoteAPI: Improve debug
Upstream-commit: 50e45b485ff61901faec1d79889d801bca7daae1
Component: engine
2013-07-13 08:15:59 -07:00
c22c23bfc2
Merge branch 'master' into list_container_processes-feature
...
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
de5cf1eef5
add debug for error in the server
...
Upstream-commit: b7937e268fcbc529a168164fc242edc56d51094c
Component: engine
2013-07-11 12:21:43 +00:00
db4a9e2ff1
add remote addr in debug
...
Upstream-commit: a0f5fb7394e6d1bf96865b8ec20796e682b4505b
Component: engine
2013-07-08 12:45:50 +00:00
bf4fc24d05
Merging from master
...
Upstream-commit: be49f0a1182164d0d279484ec35931c1e3ef6d3c
Component: engine
2013-07-05 12:27:10 -07:00
057f0a4b6f
Adding support for nicer URLs to support standalone registry (+ some registry code cleaning)
...
Upstream-commit: 66a9d06d9fa7a382c6852cf047e1448e0d3e1782
Component: engine
2013-07-05 12:20:58 -07:00
2eb55531d3
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().
Upstream-commit: 1277dca3358874d0701685f7ebb52ce66be1b385
Component: engine
2013-07-04 14:33:17 -07:00
b992f88df2
Merge pull request #1078 from kstaken/fix_json_error
...
* Remote API: Small fix in /start if empty host config
Upstream-commit: d1d66b9c5f79dc3c7b6c22c0841d5c2ba96ba51e
Component: engine
2013-07-01 16:36:58 -07:00
ab729772a8
change to top
...
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
b0d70e448b
Adding check for content-type header
...
Upstream-commit: d8d33e8b8bee1f1d37c60b9618a9008058d7abe6
Component: engine
2013-06-30 10:46:09 -07:00
e3b18af210
api,server: slice are already refs, no need to return ptr
...
Upstream-commit: 54da339b2c3d1fe11a465aff69fc4e00ec3b40fd
Component: engine
2013-06-28 12:41:09 -07:00
6657ec16bd
add /proc to list running processes inside a container
...
Upstream-commit: 2e79719622964eb95eca70372ced0ad6e4dce4f5
Component: engine
2013-06-28 15:51:58 +00:00
a223caa9e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
...
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
51f8e07a39
Implement regression test for stdin attach
...
Upstream-commit: 5190f7f33a9e36f1f5991a385f4db198e9f1b3a6
Component: engine
2013-06-24 18:36:04 -07:00
3f92ee019d
merge master and add doc
...
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
b45a456a15
consistent codebase fix
...
Upstream-commit: 1581ed52ba07a869b5902afbb7c7bb01bb1e4a63
Component: engine
2013-06-21 22:55:33 +00:00
9d597b11de
Merge pull request #848 from dotcloud/builder_server-3
...
Improve Docker build
Upstream-commit: de1a5a75cc5ae9d1084885d810d5715ee900f16d
Component: engine
2013-06-21 14:55:08 -07:00
32f89c6b42
Merge branch 'master' into fix-auth
...
Upstream-commit: 8f2a80804ce6f3ab77057a25180a27e3b346778b
Component: engine
2013-06-21 09:18:03 +00:00
3574da6a31
inverse if
...
Upstream-commit: 5b3ad0023b95823f15fe72605fa9b2786ce5035b
Component: engine
2013-06-21 09:06:09 +00:00
b61b5ee65f
- Builder: return an error when the build fails
...
Upstream-commit: d9bce2defd56bbc47f47b263257b64016e48d607
Component: engine
2013-06-20 22:15:19 -07:00
7c517d635a
Merge branch 'simpler-build-upload' ( #900 ) into builder_server-3 ( #848 )
...
Upstream-commit: 352991bdf4c0a7702fcc791b961a516fb684f4c1
Component: engine
2013-06-20 22:02:36 -07:00
c29f5f7d2f
Merge branch 'master' into simpler-build-upload
...
Conflicts:
commands.go
Upstream-commit: 86e83186b5826e9ff4b11d3425a31a72a7535ea0
Component: engine
2013-06-20 20:25:59 -07:00
5f45c865b5
Use hijack for logs instead of stream
...
Upstream-commit: b419699ab8f79f4826ec94583c6f7a46f74eeaa2
Component: engine
2013-06-20 18:18:36 -07:00
a4e9bba7a3
Merge branch 'master' into simpler-build-upload
...
Conflicts:
api.go
builder_client.go
commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine
2013-06-20 14:19:09 -07:00
63220aff61
use strconv.ParseBool in getBoolParam
...
Upstream-commit: da199846d2813467ab8bae629336f3989f285ce9
Component: engine
2013-06-20 14:34:58 +00:00
50bb26ecb8
add ps -s
...
Upstream-commit: bd04d7d475e6497070b3144e6526566b066674cf
Component: engine
2013-06-20 14:19:50 +00:00
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
11334d506a
add basic support for unix sockets
...
Upstream-commit: 3adf9ce04ef1632f82f7bd1585c135bb141aa450
Component: engine
2013-06-18 18:59:56 +00: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
726da1690f
Merge branch 'master' into builder_server-3
...
Conflicts:
utils/utils.go
Upstream-commit: 78f86ea502694bf5dbc947802ebc0f5e5426d15c
Component: engine
2013-06-14 17:08:39 -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
2a4a4027de
update docs, remove config file on 401
...
Upstream-commit: 90f6bdd6e41ec352009ffbd073c1f45983abb74b
Component: engine
2013-06-14 13:38:51 +00:00
18df81b8e1
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile.go
commands.go
docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine
2013-06-13 18:11:22 -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
3da26f2291
Implement build from git
...
Upstream-commit: 12c9b9b3c94d595ab155fc90dfc426eeada8bc75
Component: engine
2013-06-06 16:41:41 -07:00
7b79f826ad
Move the docker build URL form client to server, prepare for GIT support
...
Upstream-commit: a11e61677c7b368628975e2a0ead639b5bfcabb9
Component: engine
2013-06-06 16:09:46 -07: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
