6ad1290069
Use mime types to parse Content-Type
...
Upstream-commit: 754ed9043d6e1fed98160c7fb443bed0a9464acf
Component: engine
2013-08-06 15:57:13 +00:00
d457571635
rebase master
...
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
2013-08-05 16:25:42 +00:00
c5da071b25
Merge pull request #1382 from monnand/650-http-utils
...
650 http utils and user agent field
Upstream-commit: feda3db1dd1c76d2866c2a628e28a4999b5b88da
Component: engine
2013-08-05 08:49:12 -07:00
71b5dff299
Consider empty /etc/resolv.conf as local dns + add unit test
...
Upstream-commit: 3e9575e275c40acb04c505fa14c1ac63ba490b75
Component: engine
2013-08-02 15:23:36 -07:00
ac12d9b409
Add no cache for docker build
...
Add a new flag to disable the image cache when building images.
Upstream-commit: 3a123bc479457c4dfa14e39b7c42d9a9dccf8c32
Component: engine
2013-08-02 16:18:54 +00:00
1c96da0a53
auth with user agent
...
Upstream-commit: 4bd287e107eab1623a0e77aeaecda77fc26e7536
Component: engine
2013-08-02 03:30:45 -04:00
5eea0cead3
Merge pull request #1328 from dotcloud/1307_url_port_delete-fix
...
Use utils.ParseRepositoryTag instead of strings.Split(name, ":") in server.ImageDelete
Upstream-commit: 0c0077ed6f044f83fff75f2d7a696491fb7fe360
Component: engine
2013-07-31 07:55:06 -07:00
496b0008be
fix same issue in api.go
...
Upstream-commit: a7068510a5ee4af6776221ba00bc332266f97088
Component: engine
2013-07-31 08:01:20 +00:00
d2c440fbc7
add parallel pull to 1.4
...
Upstream-commit: 46f59dd9333baa578b184eb25b386ac2f41caf04
Component: engine
2013-07-30 12:15:33 +00:00
d8352677c8
Merge branch 'master' into 1237-improve_docker_top-feature
...
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
f910d92ead
fix tests
...
Upstream-commit: f4b41e1a6c2c5d531451bf2feeb3877e03eb8c1c
Component: engine
2013-07-24 12:28:22 +00:00
5780ce867e
bump master
...
Upstream-commit: 4bc3328e807802d77c1cdb1381d5dadf44daa6db
Component: engine
2013-07-24 12:18:53 +00:00
35c9a9d01e
getEvents a bit simpler
...
Upstream-commit: 8b3519c5f7540b99d19ed2c3163aabf9897dd5a4
Component: engine
2013-07-23 15:42:34 +00:00
012e944035
add since for polling, rename some vars
...
Upstream-commit: 2e4d4c9f60d0ad92ab0cc84c56c060678222c4db
Component: engine
2013-07-23 15:41:19 +00:00
d1efb7843b
basic version of the /events endpoint
...
Upstream-commit: b5da816487d68853a8ac46630cb3118646f71d2d
Component: engine
2013-07-23 15:41:19 +00:00
001001e211
change dockercfg to json and support multiple auth remote
...
Upstream-commit: 3bae188b8dc51911a44ea1c7b5681f9f07f9d3af
Component: engine
2013-07-23 15:07:18 +00:00
797b7b513b
bump api version to 1.4
...
Upstream-commit: eb4a0271fbb7318a7d66911ccd388c048db0c2fa
Component: engine
2013-07-19 10:34:55 +00:00
37e3d486fa
add ps args to docker top
...
Upstream-commit: cfec1c3e1b88ceeca73144198df7a210ed3dc421
Component: engine
2013-07-19 10:06:32 +00:00
2b2f5cce76
Merge pull request #1194 from crosbymichael/build-verbose
...
* Builder: Add verbose output to docker build
Upstream-commit: de563a3ea372432acb39e711eeb0b43296754c39
Component: engine
2013-07-17 12:53:06 -07:00
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
015f243412
Add verbose output to docker build
...
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
Upstream-commit: 474191dd7bca9eedaccb9de1771eecfce7dfebbb
Component: engine
2013-07-11 15:27:33 -09: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
