Commit Graph
1185 Commits
Author SHA1 Message Date
Victor Vieux 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
Victor Vieux 340c219b42 Merge branch 'master' into remote-api
Upstream-commit: 75418ec8492914cdb0010e94716dbf3b077edef1
Component: engine
2013-05-03 17:59:11 +02:00
Victor Vieux bfa697238c makefile from master
Upstream-commit: c6963da54e1aa550d58419a8275967060866bd6d
Component: engine
2013-05-03 17:51:11 +02:00
Solomon Hykes fddd243545 dockerbuilder: change order of dependencies
Upstream-commit: a82b60b30dd9b07d6ea8cd96555a798900c17caa
Component: engine
2013-05-02 19:22:41 -07:00
Solomon Hykes c3c94876c5 dockerbuilder: let the Makefile upload to s3 with 'make release'
Upstream-commit: c08d245539ef4d721b874392097016a1c8c8fb81
Component: engine
2013-05-02 18:11:54 -07:00
Solomon Hykes e7e7fbada8 Add s3 upload to 'make release'
Upstream-commit: b6a5e604ab2205a547ac5b4f743cf3c4b93ffccf
Component: engine
2013-05-02 11:32:55 -07:00
Solomon Hykes 30a5373134 + Hack: 'make s3release' uploads a clean build to s3
Upstream-commit: 6e486b638b6674694fe02d2661bd93f0ee08d425
Component: engine
2013-05-02 11:25:49 -07:00
Victor Vieux 2c79fdbc57 up to date with master
Upstream-commit: 4f0bda2dd5cfe382f7fd9cfb9f5522f42377673b
Component: engine
2013-05-02 18:36:23 +02:00
unclejack 9adb299c5b use Go 1.0.3 to build docker
Upstream-commit: 528da23d6a5e0b6f37c1241c982bb49f301632cc
Component: engine
2013-05-02 15:27:37 +03:00
Guillaume J. Charmes 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
Solomon Hykes 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
Solomon Hykes 2643d78de2 Merge branch 'origin/new-dockerbuilder'
Upstream-commit: d6a63132efe087f46f0191e14cd79a58f1483e20
Component: engine
2013-05-02 05:57:50 +00:00
Solomon Hykes 02a593d27a dockerbuilder: fix permissions
Upstream-commit: e7271cdaae50db382d5b5728904063c07d5549e4
Component: engine
2013-05-02 05:56:51 +00:00
Solomon Hykes 1f23de593c * Hack: improve the way dockerbuilder is built
Upstream-commit: 6ca3b151b1fc0b838b55586adbc6c0990cfb2586
Component: engine
2013-05-01 22:05:36 -07:00
Victor Vieux fa147c676f refactoring run/attach/logs
Upstream-commit: a4bcf7e1ac19dbf4c2e4f65af4addc1bfc47d567
Component: engine
2013-05-02 05:07:06 +02:00
Daniel Mizyrycki dc48c220f3 Fix main Vagrantfile
Upstream-commit: 0d9475346f3548c525ecfbbd44c95a47a0013f0e
Component: engine
2013-05-01 18:49:31 -07:00
Solomon Hykes 46f6747321 New Dockerfile operation: 'add'
Upstream-commit: 71199f595de081a4f2e93142d9f5b98df16e9089
Component: engine
2013-05-01 18:32:38 -07:00
Solomon Hykes 6607a39eb5 - Hack: fix dockerbuilder to build feature branches
Upstream-commit: 58b95878f13c8de443529fbd47a67988b4735e1a
Component: engine
2013-05-02 01:16:23 +00:00
Guillaume J. Charmes 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
Solomon Hykes 87d45c69b3 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 09b1cd58c00d6b10496ab8f517137268a8bc54ab
Component: engine
2013-05-01 17:18:05 -07:00
Solomon Hykes ac52cb591c Bumped version to 0.2.1
Upstream-commit: d42639e5c5623109acd302ddead237ce4d9c2617
Component: engine
2013-05-01 17:17:13 -07:00
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Solomon Hykes 399385fca4 new Dockerfile keyword: cmd to set a default runtime command
Upstream-commit: e7fb7f13d51b4026571e47981f0d432cc4b59f80
Component: engine
2013-05-01 16:43:37 -07:00
Daniel Mizyrycki 6ddae43dee development; issue #374: Update VM documentation
Upstream-commit: d172da58ceddd93c4a93132eae652e7996e1a2d2
Component: engine
2013-05-01 15:59:54 -07:00
Solomon Hykes a9fa6c7d38 * 'docker commit' inherits parent layer's run configuration by default
Upstream-commit: ad86dde10c815135ead82ed3c97caa892f7e30ed
Component: engine
2013-05-01 15:45:39 -07:00
Guillaume J. Charmes 10952020e0 Update commandline Commit doc
Upstream-commit: c20e46587d3fb09257e6ce7d085467da403210ee
Component: engine
2013-05-01 15:43:02 -07:00
Daniel Mizyrycki 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
Daniel Mizyrycki 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
Guillaume J. Charmes 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
Solomon Hykes ac9a4e4b6a New Dockerfile operation 'expose' exposes default tcp ports
Upstream-commit: 08812096f580c820d8cd06e3cb2128871551f60f
Component: engine
2013-05-01 14:16:56 -07:00
Solomon Hykes 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
Solomon Hykes 0f53d29623 + Commit default runtime options with a layer
Upstream-commit: f7aaa06606e0acf36d2979533f40e51ae7ef29c0
Component: engine
2013-05-01 11:33:21 -07:00
Guillaume J. Charmes b7c2a5f9a1 Actually use the mergeConfig function
Upstream-commit: 7ff65d40d557e0a128534c096f3cab0c10a79f7b
Component: engine
2013-05-01 11:22:06 -07:00
Ken Cochrane 3d70a9f722 added the registry API to the docker docs
Upstream-commit: 904c2a0fc353ba08e93decf169baa4ea35fe35a8
Component: engine
2013-05-01 12:31:46 -04:00
Solomon Hykes 06f7402ec1 Added dummy script for docker-build example
Upstream-commit: a3ce90b78bf5edcacdfd4312e8ec9e25b59d6abb
Component: engine
2013-05-01 00:49:28 -07:00
Solomon Hykes 44b3ef5d4b Fix example dockerfile
Upstream-commit: 03b83b3210865a1981cec43dbc9fe5d24995c060
Component: engine
2013-05-01 00:44:36 -07:00
Solomon Hykes 7cc5673df7 new Dockerfile keyword: 'push'
Upstream-commit: 40ccf1d30039a7ee975ddb2fc8aa989b1fa680fc
Component: engine
2013-05-01 00:42:11 -07:00
Solomon Hykes 8fa50ab35a docker-build: added support for 'maintainer' keyword
Upstream-commit: 038ca5ee392b974b1ace08d0a6359b02006e6aac
Component: engine
2013-05-01 00:14:52 -07:00
Solomon Hykes 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
Guillaume J. Charmes 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
Guillaume J. Charmes 5f6bf28c14 Improve crashTest
Upstream-commit: d97661aa715321a017190bd24870473ac6df34a3
Component: engine
2013-04-30 11:16:26 -07:00
Al Tobey 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
Victor Vieux ccf3ea8fbb [] instead fon null, timetsamps and wip import
Upstream-commit: 36b968bb09b72366b21b74439eeba463317d2320
Component: engine
2013-04-30 17:04:31 +02:00
Bruno Bigras 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
Victor Vieux e062adc9ba more accurate http errors, attach handle tty correctly now
Upstream-commit: 131c6ab3e6461eb1a985a8eb0a64b59e1b990810
Component: engine
2013-04-29 17:46:41 +02:00
Victor Vieux a28a51bb37 working tty
Upstream-commit: e5104a4cb4fe68ecd17b5a01ce295c64f8107b42
Component: engine
2013-04-29 15:12:18 +02:00
Victor Vieux dbf5127ab9 fix last commit
Upstream-commit: 22f5e35579c5cc4bbe191b92517d67a3ae88c2a3
Component: engine
2013-04-29 11:49:04 +02:00
Victor Vieux 16af85dc76 run now try to pull if unknown image
Upstream-commit: 30cb4b351f3513a6ebec89183def0647346b5708
Component: engine
2013-04-29 11:46:31 +02:00
Guillaume J. Charmes 89bd2e658f Improve crashTest
Upstream-commit: cdc2657ee9bdb1464a17d9daecc0659297d0ee83
Component: engine
2013-04-28 07:10:58 -07:00