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
ccf3ea8fbb
[] instead fon null, timetsamps and wip import
...
Upstream-commit: 36b968bb09b72366b21b74439eeba463317d2320
Component: engine
2013-04-30 17:04:31 +02: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
e062adc9ba
more accurate http errors, attach handle tty correctly now
...
Upstream-commit: 131c6ab3e6461eb1a985a8eb0a64b59e1b990810
Component: engine
2013-04-29 17:46:41 +02:00
a28a51bb37
working tty
...
Upstream-commit: e5104a4cb4fe68ecd17b5a01ce295c64f8107b42
Component: engine
2013-04-29 15:12:18 +02:00
16af85dc76
run now try to pull if unknown image
...
Upstream-commit: 30cb4b351f3513a6ebec89183def0647346b5708
Component: engine
2013-04-29 11:46:31 +02: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
8f8a9ec275
add network endpoint for crashTest
...
Upstream-commit: 20c2a4f80f4171ffb59ea61bdcf57d8edc970fa8
Component: engine
2013-04-28 03:54:22 -07:00
d9ff34c9b9
Update the crashTest to have the dockerpath in env
...
Upstream-commit: ebe157ebb567965e05cca45a1221cd36ec48a052
Component: engine
2013-04-28 01:27:56 -07:00
eb1c306ba5
Use default mirror from debootstrap when not explicitly provided, and add better target directory naming
...
Upstream-commit: ab34115b42cbcb42cb91593601d6daff2c7f32ad
Component: engine
2013-04-28 13:38:26 -06:00
236d6db8f3
Improve mkimage-debian script to also tag using the release version number of the final image (6.0.7, 7.0, etc.)
...
This is as discussed on #447 .
Upstream-commit: 4b3354af3fa4cea59271ace7cc4d1d072312b688
Component: engine
2013-04-28 12:31:28 -06:00
91fa0f0669
Move the capabilities detection into a runtime method
...
Upstream-commit: 9042535f5af607f2362fa3f995427e1c5aab664e
Component: engine
2013-04-26 14:32:55 -07:00
eb3034a4cf
Merge pull request #473 from dotcloud/26-auto_restart_containers-feature
...
+ runtime: Add -r flag to dockerd in order to restart previously running container....
Upstream-commit: 8f81e175af419e5669fd8b74958b0ea85d8cc248
Component: engine
2013-04-26 14:02:01 -07:00
79019a5e64
Merge pull request #467 from dotcloud/improve_localhost_port_test
...
* tests: Improve unit test to avoid unnecessary warnigns
Upstream-commit: 636c7835d3a94996918ec4f1412fc13c83ffc6ba
Component: engine
2013-04-26 14:01:13 -07:00
c7ffdd6f90
Remove -command in CmdCommit and make -config use Json
...
Upstream-commit: ae97477284fade20520b5991709d6b65d5fd4442
Component: engine
2013-04-26 10:48:33 -07:00
c2191051d8
Add contrib/mkimage-debian.sh used to create the tianon/debian images
...
Upstream-commit: 86ad98e72aa764a236984b3cc4ab8d59071b876a
Component: engine
2013-04-26 08:54:29 -06:00
43ca41eddd
Add TestCommitAutoRun
...
Upstream-commit: 30d327d37ecca58a41f4a370b581ee638ed3ff04
Component: engine
2013-04-25 17:03:13 -07:00
f98f16c605
Update unit test in order to comply with new api
...
Upstream-commit: 724e2d6b0aa5b1cbe95f39c5d22e733124cee9be
Component: engine
2013-04-25 17:02:38 -07:00
45f51cdc1d
Implement -config and -command in CmdCommit in order to allow autorun
...
Upstream-commit: 51d6228261cdc379aade581ee504b2c59a3e02a9
Component: engine
2013-04-25 16:48:31 -07:00
8dd14227bf
don't fight the box kernel version, not worth it
...
Upstream-commit: 4db680fda47306586819a41b80a9a2f6a67f0eb9
Component: engine
2013-04-25 06:29:13 -06:00
73e8a87234
get aufs dependencies into vmware image
...
Upstream-commit: 9c7293508dd849bf9086b5095b7412214d56b801
Component: engine
2013-04-25 06:09:04 -06:00
876724f84b
vmware fusion provider config
...
Upstream-commit: 9d8743a7aed88083b1a7c24a1a684e7a79108c15
Component: engine
2013-04-25 05:59:31 -06:00
85eee11a06
Add -r flag to dockerd in order to restart previously running container. Fixes #26
...
Upstream-commit: 50144aeb42283848db730b936d6b5b6332ec6565
Component: engine
2013-04-24 19:01:23 -07:00
5b920253cc
Specify a different bridge for tests than for regular runtime
...
Upstream-commit: ee298d1420ea58cdafa788d63547dadab47ef76d
Component: engine
2013-04-24 17:43:41 -07:00
d5b0d2fd8e
vagrant; issue #441 : Improve main config including aws ubuntu lts dependency
...
Upstream-commit: 2726e3649a204d15dcf79d2709e6457b6ca50c14
Component: engine
2013-04-24 11:30:15 -07:00
d1c7705ab6
fixed inspect
...
Upstream-commit: 75c0dc9526766719f6e528c48e63001596042071
Component: engine
2013-04-24 18:50:26 +02:00
71e24d7094
added export
...
Upstream-commit: c7bbe7ca797ad2f4eb0fff3d58e8eaaa72756036
Component: engine
2013-04-24 16:32:51 +02:00
74f09dee81
added commit
...
Upstream-commit: 79512b2a8025184d647de61cdd6a19ebadd17a49
Component: engine
2013-04-24 16:06:30 +02:00
6a51f02794
changed not found errors to 404, added inspect, wait and diff
...
Upstream-commit: 1e357c69690f5325d92ae7c41e396711865382f0
Component: engine
2013-04-24 14:01:40 +02:00
2bbe465e70
Bumped version to 0.2.0
...
Upstream-commit: 90668a8a997c5db27ffdcc25c7921c63526b62f4
Component: engine
2013-04-23 23:15:09 -07:00
71db175e3e
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: c7fd84b8a0bcfe70c3897e6611e6c59fd514d28f
Component: engine
2013-04-23 23:05:38 -07:00
771ccdd366
- Dev: dockerbuilder requires a fake initctl because 'apt-get install devscripts' insists on installing a stupid daemon I never asked for in the first place.
...
Upstream-commit: 874a40ed3a8a6cf5711ac377712c189e0761c706
Component: engine
2013-04-23 23:04:54 -07:00
9417414b7f
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 370fafacbfffefe92e48a354db1665400f3f7056
Component: engine
2013-04-23 22:57:50 -07:00
6c4341a951
dockerbuilder: upload most recent Ubuntu package (note version FOO might not yet be packaged at tag vFOO)
...
Upstream-commit: a0478f726d8751f37e4e20e3cc5e858bfc111180
Component: engine
2013-04-23 22:57:34 -07:00
1d1c2c4078
Merge pull request #427 from dhrp/docs
...
- Packaging: Fixed Vagrantfile
* Documentation: Updated install instructions
Upstream-commit: e5bc5a2e317de0e5c8a061d600b88116617c34f6
Component: engine
2013-04-23 19:49:28 -07:00
a2804cedc1
Merge pull request #470 from dotcloud/packaging-ubuntu
...
* Packaging: Add 0.1.8 to Ubuntu packaging changelog
* Packaging: Update the Ubuntu maintainer manual
Upstream-commit: 25fc3a7e76a13aa810b7c91fbb3a606329fd7fb7
Component: engine
2013-04-23 19:46:56 -07:00
f829dbfdd6
Makefile improvements
...
+ Convenience rules: srcrelease, deps
- Separate dependency vendoring from building the binary
(re-download dependencies with 'make deps')
Upstream-commit: b3ab0b561ed6dd06a569fa800109d18070886149
Component: engine
2013-04-23 19:41:38 -07:00
0fbc38af42
Fix 'make release RELEASE_VERSION=master'
...
Upstream-commit: 8b8c8bf7cb0ed782d727440a0f2c59d464971353
Component: engine
2013-04-23 18:50:53 -07:00
8d65f94e38
make release: build a binary release of the most recent version tag
...
Upstream-commit: a8651a23b2cca4c9a9dcc3a6829e9496d68ddef5
Component: engine
2013-04-23 18:32:59 -07:00
11495ebf7e
packaging-ubuntu: update maintainer documentation for changelog file
...
Upstream-commit: f744cfd5a75e3b1565740c2f266dbfdf7be8727a
Component: engine
2013-04-23 13:51:03 -07:00
