f1cd60ebd0development; issue #374: Upgrade development VM box to Ubuntu-13.04 with kernel 3.8 Upstream-commit: eeb03164cf1ea1b6a2abae2536cb1360c9ac8251 Component: engine
Daniel Mizyrycki
2013-05-01 15:25:58 -07:00
44a61f93b3development; issue #374: Refactor 'make hack' making Vagrantfile and VM more useful Upstream-commit: bb61678b570fabeb5d21c86fa3f7b5456111f7a2 Component: engine
Daniel Mizyrycki
2013-05-01 11:20:10 -07:00
5f26bd9cf3When no -config is set while committing, use the config of the base image Upstream-commit: a75a1b3859e6c30f0a24b262bdfc524dcdc07c3b Component: engine
Guillaume J. Charmes
2013-05-01 15:19:55 -07:00
d28619b9b2Set a layer's default runtime options with 'docker commit -run' instead of 'docker commit -config' Upstream-commit: 5c30faf6f7aba58c9b8be580acb043d56b64db1b Component: engine
Solomon Hykes
2013-05-01 12:45:45 -07:00
0f53d29623+ Commit default runtime options with a layer Upstream-commit: f7aaa06606e0acf36d2979533f40e51ae7ef29c0 Component: engine
Solomon Hykes
2013-05-01 11:33:21 -07:00
b7c2a5f9a1Actually use the mergeConfig function Upstream-commit: 7ff65d40d557e0a128534c096f3cab0c10a79f7b Component: engine
Guillaume J. Charmes
2013-05-01 11:22:06 -07:00
3d70a9f722added the registry API to the docker docs Upstream-commit: 904c2a0fc353ba08e93decf169baa4ea35fe35a8 Component: engine
Ken Cochrane
2013-05-01 12:31:46 -04:00
06f7402ec1Added dummy script for docker-build example Upstream-commit: a3ce90b78bf5edcacdfd4312e8ec9e25b59d6abb Component: engine
Solomon Hykes
2013-05-01 00:49:28 -07:00
dbf5127ab9fix last commit Upstream-commit: 22f5e35579c5cc4bbe191b92517d67a3ae88c2a3 Component: engine
Victor Vieux
2013-04-29 11:49:04 +02:00
16af85dc76run now try to pull if unknown image Upstream-commit: 30cb4b351f3513a6ebec89183def0647346b5708 Component: engine
Victor Vieux
2013-04-26 15:08:33 +02:00
cba2c66321Simplify the crashTest Upstream-commit: 76a1a7cf5ba2d2db2c7e5873df529f3f956a2156 Component: engine
Guillaume J. Charmes
2013-04-28 06:23:02 -07:00
8f8a9ec275add network endpoint for crashTest Upstream-commit: 20c2a4f80f4171ffb59ea61bdcf57d8edc970fa8 Component: engine
Guillaume J. Charmes
2013-04-28 03:54:22 -07:00
d9ff34c9b9Update the crashTest to have the dockerpath in env Upstream-commit: ebe157ebb567965e05cca45a1221cd36ec48a052 Component: engine
Guillaume J. Charmes
2013-04-28 01:27:56 -07:00
eb1c306ba5Use default mirror from debootstrap when not explicitly provided, and add better target directory naming Upstream-commit: ab34115b42cbcb42cb91593601d6daff2c7f32ad Component: engine
Tianon Gravi
2013-04-28 13:37:52 -06:00
236d6db8f3Improve mkimage-debian script to also tag using the release version number of the final image (6.0.7, 7.0, etc.)
Tianon Gravi
2013-04-28 12:31:28 -06:00
91fa0f0669Move the capabilities detection into a runtime method Upstream-commit: 9042535f5af607f2362fa3f995427e1c5aab664e Component: engine
Guillaume J. Charmes
2013-04-26 14:32:55 -07:00
eb3034a4cfMerge pull request #473 from dotcloud/26-auto_restart_containers-feature
Guillaume J. Charmes
2013-04-26 14:02:01 -07:00
79019a5e64Merge pull request #467 from dotcloud/improve_localhost_port_test
Guillaume J. Charmes
2013-04-26 14:01:13 -07:00
99df381d5aMerge pull request #478 from tianon/mkimage-debian
Guillaume J. Charmes
2013-04-26 13:51:47 -07:00
c7ffdd6f90Remove -command in CmdCommit and make -config use Json Upstream-commit: ae97477284fade20520b5991709d6b65d5fd4442 Component: engine
Guillaume J. Charmes
2013-04-26 10:48:33 -07:00
c2191051d8Add contrib/mkimage-debian.sh used to create the tianon/debian images Upstream-commit: 86ad98e72aa764a236984b3cc4ab8d59071b876a Component: engine
Tianon Gravi
2013-04-26 08:54:29 -06:00
800f7e1974run now try to pull if unknown image Upstream-commit: a48eb4dff869631221854bb85380c15bf7b9d0eb Component: engine
Victor Vieux
2013-04-26 15:08:33 +02:00
f98f16c605Update unit test in order to comply with new api Upstream-commit: 724e2d6b0aa5b1cbe95f39c5d22e733124cee9be Component: engine
Guillaume J. Charmes
2013-04-25 17:02:38 -07:00
45f51cdc1dImplement -config and -command in CmdCommit in order to allow autorun Upstream-commit: 51d6228261cdc379aade581ee504b2c59a3e02a9 Component: engine
Guillaume J. Charmes
2013-04-25 16:48:31 -07:00
8dd14227bfdon't fight the box kernel version, not worth it Upstream-commit: 4db680fda47306586819a41b80a9a2f6a67f0eb9 Component: engine
Brian McCallister
2013-04-25 06:29:13 -06:00
73e8a87234get aufs dependencies into vmware image Upstream-commit: 9c7293508dd849bf9086b5095b7412214d56b801 Component: engine
Brian McCallister
2013-04-25 06:09:04 -06:00
85eee11a06Add -r flag to dockerd in order to restart previously running container. Fixes#26 Upstream-commit: 50144aeb42283848db730b936d6b5b6332ec6565 Component: engine
Guillaume J. Charmes
2013-04-24 19:01:23 -07:00
5b920253ccSpecify a different bridge for tests than for regular runtime Upstream-commit: ee298d1420ea58cdafa788d63547dadab47ef76d Component: engine
Guillaume J. Charmes
2013-04-24 17:43:41 -07:00
6a51f02794changed not found errors to 404, added inspect, wait and diff Upstream-commit: 1e357c69690f5325d92ae7c41e396711865382f0 Component: engine
Victor Vieux
2013-04-24 14:01:40 +02:00
2bbe465e70Bumped version to 0.2.0 Upstream-commit: 90668a8a997c5db27ffdcc25c7921c63526b62f4 Component: engine
Solomon Hykes
2013-04-23 23:15:09 -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
Solomon Hykes
2013-04-23 23:04:54 -07:00
6c4341a951dockerbuilder: upload most recent Ubuntu package (note version FOO might not yet be packaged at tag vFOO) Upstream-commit: a0478f726d8751f37e4e20e3cc5e858bfc111180 Component: engine
Solomon Hykes
2013-04-23 22:57:34 -07:00
8d65f94e38make release: build a binary release of the most recent version tag Upstream-commit: a8651a23b2cca4c9a9dcc3a6829e9496d68ddef5 Component: engine
Solomon Hykes
2013-04-23 18:32:59 -07:00
11495ebf7epackaging-ubuntu: update maintainer documentation for changelog file Upstream-commit: f744cfd5a75e3b1565740c2f266dbfdf7be8727a Component: engine
Daniel Mizyrycki
2013-04-23 13:51:03 -07:00
5cff06982aFixed remaining issues and conflicts created by last merge. Upstream-commit: 1ddca1948bbfd77ad3c4f0eeda640c39d315d9ae Component: engine
Thatcher Peskens
2013-04-23 12:04:53 -07:00
2e5e342257dockerbuilder: use a pristine GOPATH, with the fresh checkout registered at the right path (for internal submodules) Upstream-commit: 2485bb2cd20a453c2c5f0fff3a6481ef539da591 Component: engine
Solomon Hykes
2013-04-23 11:45:47 -07:00
7dad97c027Remove unecessary memeory limit within tests Upstream-commit: 6ebb2491314afb3be4b0b82d14ddba743ec460de Component: engine
Guillaume J. Charmes
2013-04-23 11:25:16 -07:00
7a87a87114Improve TestMultipleAttachRestart to avoid unnecessary warning Upstream-commit: c45beabcd54090bcb31eaa7a5af5878262b7b0e5 Component: engine
Guillaume J. Charmes
2013-04-23 11:22:30 -07:00
27ad61c153Wait for the container to finish in TestAttachDisconnect before destroying it Upstream-commit: a22c78523f20c44e90e7a3adbd01a5560ed4f6ae Component: engine
Guillaume J. Charmes
2013-04-23 11:09:48 -07:00
b74a205fb6Make sure the container is well started prior to perform the test Upstream-commit: 5a02c9ba0a8e4dc19001a11d00049ec2c76511f0 Component: engine
Guillaume J. Charmes
2013-04-23 10:28:40 -07:00
fd63b71156dockerbuilder: build in current directory instead /go and /tmp Upstream-commit: 7577f48dc441d14cb600b799498f29f9b4639ffe Component: engine
Solomon Hykes
2013-04-23 10:53:02 -07:00
9091b2150cdockerbuilder: /usr/local/bin is already set by docker Upstream-commit: 0512cf9c839be2c5370830cb80bcbec400273eac Component: engine
Solomon Hykes
2013-04-23 10:49:58 -07:00
f9222f5820Increased timeout in TCP port allocation test to pass on slower machines Upstream-commit: 73da7a12e7d6846a12571e6eac1f16502219c9d4 Component: engine
Solomon Hykes
2013-04-23 10:12:46 -07:00
efa5049675added run (wip), fixed ps and images, added port and tag Upstream-commit: cf19be44a8eb9b790ba3bef29f851dc65cb61c3c Component: engine
Victor Vieux
2013-04-23 18:20:53 +02:00
f62367f034Completed Changelog for all past versions Upstream-commit: 4f6cc5c7330a7389d558dece2e432f13249bd565 Component: engine
Solomon Hykes
2013-04-23 00:30:18 -07:00
f318096044Update FindCgroupMountpoint to be more forgiving
Tianon Gravi
2013-04-23 01:09:29 -06:00
55a64b53cc- Runtime: ghost containers can be killed. Upstream-commit: 95e066d24fc4d9248e5e98f6d8ce018764834547 Component: engine
Solomon Hykes
2013-04-22 22:30:33 -07:00
054b038e78hack/dockerbuilder: a standard build environment for building and uploading official binary builds of docker... inside docker Upstream-commit: 82b8f7a565ec1fdd82644ef715767ea93d95a0b0 Component: engine
Solomon Hykes
2013-04-22 22:29:12 -07:00
e294fd1dc7Bumped version to 0.1.8 Upstream-commit: 97badbd29e15296b2b4cb55b01246f658c5e9de6 Component: engine
Solomon Hykes
2013-04-22 22:04:57 -07:00
2d0236d1b1Merge pull request #463 from dotcloud/improve_pid_file_feature
Guillaume J. Charmes
2013-04-22 18:24:03 -07:00
e45cc3d0d4Merge pull request #442 from dotcloud/fix_deleted_file_diff
Guillaume J. Charmes
2013-04-22 18:23:46 -07:00
5b94f91912Merge pull request #456 from dotcloud/453-generic_kernel_detection-fix
Guillaume J. Charmes
2013-04-22 18:20:17 -07:00
56cb20082eMake kernel detection work without suffix Upstream-commit: c05c91ca3bb69d2c9faa0a2b15bc23b7c2a7bd8a Component: engine
Guillaume J. Charmes
2013-04-22 13:19:50 -07:00
51acd7e848Forbid attach to ghost Upstream-commit: b76d63cb0c97aacec6d81c07108d2a573fb8af05 Component: engine
Guillaume J. Charmes
2013-04-19 14:18:03 -07:00
af6dece8d5Allow to kill/stop ghosts Upstream-commit: f926ed182f908aba20980202becfcdbe2d1e9c34 Component: engine
Guillaume J. Charmes
2013-04-19 12:21:39 -07:00
ffa41c520dAllow to kill container after docker server restarts Upstream-commit: d440782e17d384d52c813f93cd53d2d8a15fd13a Component: engine
Guillaume J. Charmes
2013-04-19 12:12:30 -07:00
e0f172a6ffAllow to wait on container even after docker server restarts using lxc-info Upstream-commit: 82848d415866d08121bb52857e7d7b1d2a952c0c Component: engine
Guillaume J. Charmes
2013-04-19 12:08:43 -07:00
9868eec5a4Add unit test for file deletion Upstream-commit: 97535e5a6466dcad6ed9767960e869eadf68204f Component: engine
Guillaume J. Charmes
2013-04-22 17:51:09 -07:00
2a6be2d202Check that the pid in pidfile exists before preventing docker to start Upstream-commit: f079fbe3fa90d58d414341bed5246539c89b61b2 Component: engine
Guillaume J. Charmes
2013-04-22 15:57:31 -07:00
494b53d7fcMerge pull request #457 from shamrin/patch-1
Guillaume J. Charmes
2013-04-22 15:40:03 -07:00