6a579abd18
Merge pull request #1061 from proppy/fix-slices-ref
...
api,server: slice are already refs, no need to return ptr
Upstream-commit: 5e029f760000be547350e520302c5811d85fe525
Component: engine
2013-07-01 04:51:56 -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
ddffbf8c3d
Fixed conflicts
...
Upstream-commit: ac37fcf6f3f28f56b4ad58143891be9b1fe99dec
Component: engine
2013-06-28 12:36:59 -07:00
2be0a9146e
Resolve conflict
...
Upstream-commit: 893c974b08b8859a4d6d3d7d38d9c21c9b6472c3
Component: engine
2013-06-28 12:32:41 -07:00
c2894b0393
go fmt pass
...
Upstream-commit: ad2f826a825be2889057a773eff1a2bc605e8e80
Component: engine
2013-06-28 18:19:58 +02:00
4eec06d217
Several fixes and updates to make this work with latest changes in master
...
Upstream-commit: c3dd6e1926f9359f840a9f7b0be9cfa7fe2cfea2
Component: engine
2013-06-28 18:19:58 +02:00
d5e7a7e8e9
Reenable writeflusher for pull
...
Upstream-commit: 67ecd2cb822894e4d35adea031e5b79d7ca8e91a
Component: engine
2013-06-28 18:19:58 +02:00
01a345c7fb
Remove https prefix from registry
...
Upstream-commit: 57d751c3770194ff867ebace36eb1be7d72d2fe9
Component: engine
2013-06-28 18:19:58 +02:00
a944a8deb6
Ignore 'registry not found' when pushing on independent registries
...
Upstream-commit: 2a1f8f6fda55a5fa2132dbad374043e9fbf6d9f6
Component: engine
2013-06-28 18:19:58 +02:00
1f3a1ee5ca
Tentative support for independent registries
...
Upstream-commit: de0a48bd6ff2acfb2ab546a1e718185872eea2c3
Component: engine
2013-06-28 18:19:58 +02:00
5063918d95
URL schemes of both Registry and Index are now consistent
...
Upstream-commit: 3175e56ad03cbe0118c0982606c5eba9e34c1b07
Component: engine
2013-06-27 17:55:17 -07: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
d9bf1bf281
Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param
...
Upstream-commit: 862e223cecec203a96d3be4fd667bc9286703e82
Component: engine
2013-06-25 13:33:45 +00:00
3f92ee019d
merge master and add doc
...
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
5f45c865b5
Use hijack for logs instead of stream
...
Upstream-commit: b419699ab8f79f4826ec94583c6f7a46f74eeaa2
Component: engine
2013-06-20 18:18:36 -07:00
ffff9b2ac4
Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker".
...
Upstream-commit: e44f62a95cc8f3cab446205d66450ee37911e29c
Component: engine
2013-06-20 16:29:54 -05:00
4e81510bee
Merge pull request #907 from dotcloud/go1.1_cookie_jar-feature
...
* Runtime: use go 1.1 cookiejar and remove ResetClient
Upstream-commit: 21a5a6202dc7695b40a86ff82d63a888bca052ac
Component: engine
2013-06-20 10:48:36 -07:00
20435df2c1
add warning when you rm a running container
...
Upstream-commit: 1c841d4feed99ad568b7a5b04cedf8d65c3bb92c
Component: engine
2013-06-20 15:45:30 +00:00
50bb26ecb8
add ps -s
...
Upstream-commit: bd04d7d475e6497070b3144e6526566b066674cf
Component: engine
2013-06-20 14:19:50 +00:00
b90fb28665
rebase master
...
Upstream-commit: 5f93aa0ecf26699d0e905811d9125081811093b7
Component: engine
2013-06-20 13:56:36 +00:00
df019d0466
Merge pull request #948 from dotcloud/registry_pathencode
...
* Registry: Use opaque requests when we need to preserve urlencoding in registry requests
Upstream-commit: 8a131dffb6531d64f7ed1fefea5a5110dba29a56
Component: engine
2013-06-19 22:41:16 -07:00
9b7da2ae1e
Merge pull request #917 from dotcloud/pull_pool
...
- Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311
Upstream-commit: 7e065aaacd35f0db675c4699c846e01314b18765
Component: engine
2013-06-19 14:11:29 -07:00
c4347cd657
Use opaque requests when we need to preserve urlencoding in registry requests
...
Upstream-commit: 0312bbc535de01cade67299dd41a69935c7241ba
Component: engine
2013-06-19 13:49:45 -07:00
1644bb786c
Merge pull request #849 from dotcloud/improve_progressbar_pull
...
* Client: HumanReadable ProgressBar sizes in pull
Upstream-commit: ec3c89e57c3e91fabb9b084a2762faa20ca720ec
Component: engine
2013-06-19 08:02:40 -07:00
0d4d92aeeb
Merge pull request #916 from dotcloud/race_attach-fix
...
- Runtime: Fix race condition within Run command when attaching.
Upstream-commit: 0a9ac63a051c1808c7b8ac3ba06ed44e5b86fd4d
Component: engine
2013-06-18 17:13:38 -07:00
531f894fab
* API: Send all tags on History API call
...
Upstream-commit: 808faa6371c470fa0765f5d4e3aed7708d8f9ee6
Component: engine
2013-06-18 10:31:07 -07:00
00bc56197b
* API: Add tag lookup to history command. Fixes #882
...
Upstream-commit: 3bfc82257878e55141bb029390574130c3ac0530
Component: engine
2013-06-17 18:39:30 -07:00
18c9c45d0a
- Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311
...
Upstream-commit: fe204e6f48eb47a1deb3553003eaf9863a66fd1a
Component: engine
2013-06-17 16:10:00 -07:00
fa0630fa0a
Move the attach prevention from server to client
...
Upstream-commit: c106ed32ea7613573a2081d47ad2498429ac86f2
Component: engine
2013-06-17 15:40:04 -07:00
5daee8b0f6
use go 1.1 cookiejar and revome ResetClient
...
Upstream-commit: fde82f448f6b1508e03f419a3ce4c9b80311d466
Component: engine
2013-06-17 18:13:40 +00:00
158248b9fd
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 17235eb0893fc7f8658ed36da0ec336b2d1fca5d
Component: engine
2013-06-14 15:07:05 -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
43010d8df6
Merge pull request #892 from unclejack/validate_memory_limits
...
* Runtime: validate memory limits & error out if it's less than 524288
Upstream-commit: 813771e6b79bb40d72895ec6f95cb7aa61b193fe
Component: engine
2013-06-14 14:32:28 -07:00
539c6ff974
Merge branch 'master' into improve_progressbar_pull
...
Upstream-commit: 60fd7d686dea6645ab61c27d0132d38c07a89e80
Component: engine
2013-06-14 12:01:40 -07:00
5026ebfb0a
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: c701de939f645030b36f2f89acbbcf30979fe5be
Component: engine
2013-06-14 11:58:46 -07:00
600eb1d103
Merge branch 'master' into postupload-endpoints-header
...
Conflicts:
server.go
Upstream-commit: 78e4a385f77c33933afc47c8b3f4436ce648eb54
Component: engine
2013-06-14 11:50:58 -07:00
d7771969bf
validate memory limits & error out if less than 512 KB
...
Upstream-commit: 9ee11161bf0c635a0b0164ae1dee806c6fcfe7b7
Component: engine
2013-06-14 19:52:44 +03:00
730a1370b2
Merge branch 'master' into 22-add_sizes_images_and_containers-feature
...
Upstream-commit: ddf5a1940fdbe2efa7136e7f5f26c2adc1a59b3e
Component: engine
2013-06-14 10:05:06 +00:00
5bf955bfcc
fix virtual size on images
...
Upstream-commit: 00cf2a1fa264c167dff0dd50e296c93d4c59908f
Component: engine
2013-06-14 10:05:01 +00: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
768878b42d
Merge pull request #852 from dotcloud/556-docker-search-fmt
...
Remove CR/NL from description in docker CLI
Upstream-commit: 3491df6edbfba44d655e3ffec98d1c232b738b71
Component: engine
2013-06-12 10:17:05 -07:00
604adb2ef8
* Remote Api: Add flag to enable cross domain requests
...
Upstream-commit: 20bf0e00e81fdff34c821fd880a92e822fb5ba15
Component: engine
2013-06-11 10:12:36 +00:00
2bcee3140c
rebump
...
Upstream-commit: 66d9a733622ba9a8f9671bac7d33776981672940
Component: engine
2013-06-10 21:05:54 +00:00
dc9ee2c506
Escape remote names on repo push/pull
...
Upstream-commit: d227af1edd5366df91f96193ddff3ff43d54b4f4
Component: engine
2013-06-10 11:28:27 -07:00
6e3420c0ae
Support for special namespace 'src' (highland support)
...
Upstream-commit: 4e180107314a0a7768120ed66e615c8f668677bd
Component: engine
2013-06-10 11:28:26 -07:00
398ed3eba0
Send X-Docker-Endpoints header when validating the images upload with the index at the end of a push
...
Upstream-commit: db3242e4bb1c31a7319e6273235a9ba6b29a61d4
Component: engine
2013-06-10 11:21:56 -07:00
91572e7677
Remove CR/NL from description in docker CLI. Also moved description shortening to the client
...
Upstream-commit: 8d4282cd36e3516c08dfa624da352b445bedf204
Component: engine
2013-06-07 06:09:24 -07:00
2aea6ddf00
Make the progressbar take the image size into consideration
...
Upstream-commit: f355d33b5fe37ce7c0c25373255ea8afd931f4e7
Component: engine
2013-06-06 18:16:16 -07:00
