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
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
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
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
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
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
ac52cb591c
Bumped version to 0.2.1
...
Upstream-commit: d42639e5c5623109acd302ddead237ce4d9c2617
Component: engine
2013-05-01 17:17:13 -07:00
0d2bce5b40
Merge pull request #495 from dotcloud/autorun_docs
...
* docs: Update commandline Commit doc
Upstream-commit: d0c2e31fb920fd1ff738b16798f1ffdecdac272e
Component: engine
2013-05-01 17:14:53 -07:00
afb3d4d1e6
Merge pull request #493 from dotcloud/374-developer-environment
...
* hack: development; issue #374 : Refactor 'make hack' making Vagrantfile and VM more useful
Upstream-commit: 509a01bbe44abfc1fbe4b1973e75018ba0378d63
Component: engine
2013-05-01 16:54:29 -07:00
399385fca4
new Dockerfile keyword: cmd to set a default runtime command
...
Upstream-commit: e7fb7f13d51b4026571e47981f0d432cc4b59f80
Component: engine
2013-05-01 16:43:37 -07:00
6ddae43dee
development; issue #374 : Update VM documentation
...
Upstream-commit: d172da58ceddd93c4a93132eae652e7996e1a2d2
Component: engine
2013-05-01 15:59:54 -07:00
a9fa6c7d38
* 'docker commit' inherits parent layer's run configuration by default
...
Upstream-commit: ad86dde10c815135ead82ed3c97caa892f7e30ed
Component: engine
2013-05-01 15:45:39 -07:00
10952020e0
Update commandline Commit doc
...
Upstream-commit: c20e46587d3fb09257e6ce7d085467da403210ee
Component: engine
2013-05-01 15:43:02 -07:00
f1cd60ebd0
development; issue #374 : Upgrade development VM box to Ubuntu-13.04 with kernel 3.8
...
Upstream-commit: eeb03164cf1ea1b6a2abae2536cb1360c9ac8251
Component: engine
2013-05-01 15:26:27 -07:00
44a61f93b3
development; issue #374 : Refactor 'make hack' making Vagrantfile and VM more useful
...
Upstream-commit: bb61678b570fabeb5d21c86fa3f7b5456111f7a2
Component: engine
2013-05-01 15:26:27 -07:00
5f26bd9cf3
When no -config is set while committing, use the config of the base image
...
Upstream-commit: a75a1b3859e6c30f0a24b262bdfc524dcdc07c3b
Component: engine
2013-05-01 15:24:28 -07:00
ac9a4e4b6a
New Dockerfile operation 'expose' exposes default tcp ports
...
Upstream-commit: 08812096f580c820d8cd06e3cb2128871551f60f
Component: engine
2013-05-01 14:16:56 -07:00
d28619b9b2
Set a layer's default runtime options with 'docker commit -run' instead of 'docker commit -config'
...
Upstream-commit: 5c30faf6f7aba58c9b8be580acb043d56b64db1b
Component: engine
2013-05-01 12:45:45 -07:00
0f53d29623
+ Commit default runtime options with a layer
...
Upstream-commit: f7aaa06606e0acf36d2979533f40e51ae7ef29c0
Component: engine
2013-05-01 11:33:21 -07:00
b7c2a5f9a1
Actually use the mergeConfig function
...
Upstream-commit: 7ff65d40d557e0a128534c096f3cab0c10a79f7b
Component: engine
2013-05-01 11:22:06 -07:00
3d70a9f722
added the registry API to the docker docs
...
Upstream-commit: 904c2a0fc353ba08e93decf169baa4ea35fe35a8
Component: engine
2013-05-01 12:31:46 -04:00
06f7402ec1
Added dummy script for docker-build example
...
Upstream-commit: a3ce90b78bf5edcacdfd4312e8ec9e25b59d6abb
Component: engine
2013-05-01 00:49:28 -07:00
44b3ef5d4b
Fix example dockerfile
...
Upstream-commit: 03b83b3210865a1981cec43dbc9fe5d24995c060
Component: engine
2013-05-01 00:44:36 -07:00
7cc5673df7
new Dockerfile keyword: 'push'
...
Upstream-commit: 40ccf1d30039a7ee975ddb2fc8aa989b1fa680fc
Component: engine
2013-05-01 00:42:11 -07:00
8fa50ab35a
docker-build: added support for 'maintainer' keyword
...
Upstream-commit: 038ca5ee392b974b1ace08d0a6359b02006e6aac
Component: engine
2013-05-01 00:14:52 -07:00
6179f6bbff
Merge pull request #485 from brunoqc/patch-1
...
* Packaging: connect to Ubuntu key server on port 80
Upstream-commit: 957c500ac9054067ace52530c282495cd56b3701
Component: engine
2013-04-30 15:46:57 -07:00
4dabc1b080
Merge pull request #488 from tobert/cgroups-via-proc-mounts
...
* runtime: Use /proc/mounts instead of mount(8)
Upstream-commit: 62a595da5c5518e0b6618c9608e07602b934b42a
Component: engine
2013-04-30 14:39:14 -07:00
5f6bf28c14
Improve crashTest
...
Upstream-commit: d97661aa715321a017190bd24870473ac6df34a3
Component: engine
2013-04-30 11:16:26 -07:00
500a2c5aa9
Use /proc/mounts instead of mount(8)
...
Specifically, Ubuntu Precise's cgroup-lite script uses mount -n
to mount the cgroup filesystems so they don't appear in mtab, so
detection always fails unless the admin updates mtab with /proc/mounts.
/proc/mounts is valid on just about every Linux machine in existence and
as a bonus is much easier to parse.
I also removed the regex in favor of a more accurate parser that should
also support monolitic cgroup mounts (e.g. mount -t cgroup none /cgroup).
Upstream-commit: c6119da33925fccf6af3f232f7aa7c75de41493b
Component: engine
2013-04-30 17:37:43 +00:00
a0f6e6e3a7
Use the 80 port with keyserver.ubuntu.com
...
Use the 80 port with keyserver.ubuntu.com so it works with corporate firewalls
Upstream-commit: 5051c20833cd3310d27564fe20f856f7e77b92f3
Component: engine
2013-04-29 15:53:50 -03:00
89bd2e658f
Improve crashTest
...
Upstream-commit: cdc2657ee9bdb1464a17d9daecc0659297d0ee83
Component: engine
2013-04-28 07:10:58 -07:00
cba2c66321
Simplify the crashTest
...
Upstream-commit: 76a1a7cf5ba2d2db2c7e5873df529f3f956a2156
Component: engine
2013-04-28 06:23:02 -07:00
