b659f35e7b
bump to 0.2.2
...
Upstream-commit: 6f9b574f25e8fca5e4a28a35b71e4755a424bed8
Component: engine
2013-05-06 11:53:00 +02:00
3a6a7097c6
split api and server. run return exit code. import, pull and commit uses the smae endpoint. non zero status code on failure
...
Upstream-commit: 04cd20fa627635d30ea315d0d4e281e10e8d293c
Component: engine
2013-05-06 11:31:22 +02:00
a849d540bf
Merge pull request #515 from drnic/vagrant_overrides
...
Allow reuse of existing vagrant boxes by env variables
Upstream-commit: e392b7ee9b9cf70ff212e947142a0cf89ca7b8b0
Component: engine
2013-05-04 16:47:17 -07:00
87d18405c3
Allow reuse of existing vagrant boxes by env variables
...
Usage:
BOX_NAME=precise64 vagrant up
Upstream-commit: 04f41ebdbca8969a97cd5366fbf55e1a5d521ead
Component: engine
2013-05-03 15:35:51 -07:00
06be1f94f8
Merge pull request #501 from losinggeneration/fix_cgroup_memory_check
...
- runtime: strings.Split may return an empty string on no match
Upstream-commit: c34989f1c49fe7d652a48215fa5a6f869245c5e4
Component: engine
2013-05-03 14:29:43 -07:00
0d8c032587
Fix a bug in the Makefile which caused dependency download to fail
...
Upstream-commit: a7c0e9a355216048063894a3d47aac2d81c42c3f
Component: engine
2013-05-03 12:58:44 -07:00
709a89d62b
Merge pull request #487 from brunoqc/patch-2
...
* vagrant: Use only one deb line in /etc/apt
Upstream-commit: 19df5a79653c58b02edcd6e688cff27b21803720
Component: engine
2013-05-03 11:55:16 -07:00
8f0ba8b1bd
Check that the line is valid with 6 parts after split
...
Upstream-commit: 589d7c68dbfe0cf4a84b96b799871bfbff4a5970
Component: engine
2013-05-03 13:49:10 -05:00
f3539eb51c
Merge pull request #508 from bdon/master
...
* docs: doc fix
Upstream-commit: 8ef72cbc94232931545b8306ead5a0cc152ede22
Component: engine
2013-05-03 11:41:14 -07:00
340c219b42
Merge branch 'master' into remote-api
...
Upstream-commit: 75418ec8492914cdb0010e94716dbf3b077edef1
Component: engine
2013-05-03 17:59:11 +02:00
bfa697238c
makefile from master
...
Upstream-commit: c6963da54e1aa550d58419a8275967060866bd6d
Component: engine
2013-05-03 17:51:11 +02:00
f2c645d68e
Fix the command existance check
...
Upstream-commit: b9ec03c21b8fdbc54fdd7a3cb86f3c555e91f989
Component: engine
2013-05-02 20:50:28 -07:00
35946b6f37
correct documentation for where images are stored on filesystem.
...
Upstream-commit: 6cbe27b7a53e5818d1f5e193db00a58e3165557f
Component: engine
2013-05-02 20:37:08 -07:00
fddd243545
dockerbuilder: change order of dependencies
...
Upstream-commit: a82b60b30dd9b07d6ea8cd96555a798900c17caa
Component: engine
2013-05-02 19:22:41 -07:00
c3c94876c5
dockerbuilder: let the Makefile upload to s3 with 'make release'
...
Upstream-commit: c08d245539ef4d721b874392097016a1c8c8fb81
Component: engine
2013-05-02 18:11:54 -07:00
e6dd1bf4aa
Fix server crash when running an image without command without autorun
...
Upstream-commit: 64d7bc442daa012683b38183c71674b9ecd660c2
Component: engine
2013-05-02 13:56:45 -07:00
9af19a7a8b
strings.Split may return an empty string on no match
...
* This fixes an index out of range crash if cgroup memory is not
enabled.
Upstream-commit: 4bc8ef42d4f294bf6fec6d728ef27abbb638b98d
Component: engine
2013-05-02 14:44:41 -05:00
1e4304b721
Fix issue within mergeConfig preventing hostname and user to be set
...
Upstream-commit: 83784989514ca010bf6c292b01482e0baa14ff85
Component: engine
2013-05-02 12:32:10 -07:00
64cd9c2d11
Fix typo for command run docs
...
Upstream-commit: 1617a18258ccc7e07f30aef02a9b085627eb388a
Component: engine
2013-05-02 12:11:57 -07:00
e9ace295d8
Fix date typos in changelog
...
Upstream-commit: 6c1bb39c09446a608d48334fdf2b06cf0fac8d1a
Component: engine
2013-05-03 15:40:32 -07:00
5f130205ae
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: f6b5cd77ebfff7b18dbfcdb8bfddce0f93305e23
Component: engine
2013-05-03 15:37:37 -07:00
d65444fd93
Bumped version to 0.2.2
...
Upstream-commit: 5ffd63070f9b4d7516d58a4b3691be36d5ae93c6
Component: engine
2013-05-03 15:19:20 -07:00
283609708c
+ Documentation: new example: sharing data between 2 couchdb databases
...
Upstream-commit: 701132259d843087fafb30d7a1feb05d1b4f7a8e
Component: engine
2013-05-03 15:13:12 -07:00
dd9453f294
+ Support for data volumes
...
Upstream-commit: 18b8eeb48492c27588da2d8c6c36f5f080338d56
Component: engine
2013-05-03 13:03:47 -07:00
e7e7fbada8
Add s3 upload to 'make release'
...
Upstream-commit: b6a5e604ab2205a547ac5b4f743cf3c4b93ffccf
Component: engine
2013-05-02 11:32:55 -07:00
30a5373134
+ Hack: 'make s3release' uploads a clean build to s3
...
Upstream-commit: 6e486b638b6674694fe02d2661bd93f0ee08d425
Component: engine
2013-05-02 11:25:49 -07:00
755075c572
Use only one deb line in /etc/apt
...
This prevents the script from filling up /etc/apt/sources.list with more than one deb line which cause a warning when updating.
Upstream-commit: 74cd7e822d4fbac96faab1173cf2fc4e95658901
Component: engine
2013-05-02 13:33:23 -04:00
2c79fdbc57
up to date with master
...
Upstream-commit: 4f0bda2dd5cfe382f7fd9cfb9f5522f42377673b
Component: engine
2013-05-02 18:36:23 +02:00
9951e24504
Update docs for Command Run
...
Upstream-commit: 21b9dcd518871088086943f95bf39f068b30691f
Component: engine
2013-05-02 09:26:29 -07:00
cc5f724fb6
Fix the graph.Create prototype
...
Upstream-commit: 897cc573f051f1d88be0fde05946e66d0c86c43e
Component: engine
2013-05-02 09:23:29 -07:00
2217f9531a
Comply to the new graph.Create() prototype
...
Upstream-commit: b0459adc271b20cde11da6a74cc5a71bab23f2ac
Component: engine
2013-05-02 09:14:23 -07:00
4f88abdf1f
Implement the data volume removal
...
Upstream-commit: 3edd14b8c2eb13f45834f5d9306a579b256f9348
Component: engine
2013-05-02 09:14:23 -07:00
50127083eb
Implement the -volumes-from in order to mount volumes from an other container
...
Upstream-commit: 4099a31304863edf5b4d1b594b41c7ce1a33c5e1
Component: engine
2013-05-02 09:14:22 -07:00
f39494f601
Move the id of volumes to Container (instead of Container.Config)
...
Upstream-commit: 6fb495bf6ff545753518e9b9ed39c2676230c277
Component: engine
2013-05-02 09:14:22 -07:00
1e08918b54
Switch back config to map[string]struct{}
...
Upstream-commit: faf8daa7c68f2511dedfad15e1fd05f9eff077a2
Component: engine
2013-05-02 09:14:22 -07:00
307cd72164
Handle data volumes mount points
...
Upstream-commit: 8d9aaee60bf03397e51e8c84232a73fcb3baf36c
Component: engine
2013-05-02 09:14:22 -07:00
4d826b11e2
Change the volumes type to map[string]string to store both source and destination
...
Upstream-commit: 35d704c8a006263d1539994f02c7bfbe97202528
Component: engine
2013-05-02 09:14:22 -07:00
be84d975bd
docker run -v PATH: bind a new data volume to a container
...
Upstream-commit: 1df5f4094bf31edba6f2a2f07bfdada54340c1e4
Component: engine
2013-05-02 09:14:22 -07:00
9adb299c5b
use Go 1.0.3 to build docker
...
Upstream-commit: 528da23d6a5e0b6f37c1241c982bb49f301632cc
Component: engine
2013-05-02 15:27:37 +03:00
113b997422
Merge pull request #496 from dotcloud/480-vagrant-fix
...
- vagrant: Fix main Vagrantfile
Upstream-commit: ff5e238de9d2d26afe84270777acd8a0d9986c4d
Component: engine
2013-05-01 23:38:18 -07:00
f669f181f5
Merge pull request #492 from kencochrane/registry-api-doc
...
+ Registry: added the registry API to the docker docs
Upstream-commit: c63dce393ec9393cd38ebd197c32eec735381964
Component: engine
2013-05-01 23:00:58 -07:00
2643d78de2
Merge branch 'origin/new-dockerbuilder'
...
Upstream-commit: d6a63132efe087f46f0191e14cd79a58f1483e20
Component: engine
2013-05-02 05:57:50 +00:00
02a593d27a
dockerbuilder: fix permissions
...
Upstream-commit: e7271cdaae50db382d5b5728904063c07d5549e4
Component: engine
2013-05-02 05:56:51 +00:00
1f23de593c
* Hack: improve the way dockerbuilder is built
...
Upstream-commit: 6ca3b151b1fc0b838b55586adbc6c0990cfb2586
Component: engine
2013-05-01 22:05:36 -07:00
fa147c676f
refactoring run/attach/logs
...
Upstream-commit: a4bcf7e1ac19dbf4c2e4f65af4addc1bfc47d567
Component: engine
2013-05-02 05:07:06 +02:00
dc48c220f3
Fix main Vagrantfile
...
Upstream-commit: 0d9475346f3548c525ecfbbd44c95a47a0013f0e
Component: engine
2013-05-01 18:49:31 -07:00
46f6747321
New Dockerfile operation: 'add'
...
Upstream-commit: 71199f595de081a4f2e93142d9f5b98df16e9089
Component: engine
2013-05-01 18:32:38 -07:00
6607a39eb5
- Hack: fix dockerbuilder to build feature branches
...
Upstream-commit: 58b95878f13c8de443529fbd47a67988b4735e1a
Component: engine
2013-05-02 01:16:23 +00:00
c9f8d85006
Merge pull request #482 from dotcloud/move_capabilitie_function
...
* runtime: Move the capabilities detection into a runtime method
Upstream-commit: e431dc26f115cee290b9bfcdf73a1ea4eebecfce
Component: engine
2013-05-01 17:43:32 -07:00
87d45c69b3
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 09b1cd58c00d6b10496ab8f517137268a8bc54ab
Component: engine
2013-05-01 17:18:05 -07:00
