Commit Graph

  • afb3d4d1e6 Merge pull request #493 from dotcloud/374-developer-environment Guillaume J. Charmes 2013-05-01 16:54:29 -07:00
  • 399385fca4 new Dockerfile keyword: cmd to set a default runtime command Upstream-commit: e7fb7f13d51b4026571e47981f0d432cc4b59f80 Component: engine Solomon Hykes 2013-05-01 16:43:37 -07:00
  • 6ddae43dee development; issue #374: Update VM documentation Upstream-commit: d172da58ceddd93c4a93132eae652e7996e1a2d2 Component: engine Daniel Mizyrycki 2013-05-01 15:59:54 -07:00
  • a9fa6c7d38 * 'docker commit' inherits parent layer's run configuration by default Upstream-commit: ad86dde10c815135ead82ed3c97caa892f7e30ed Component: engine Solomon Hykes 2013-05-01 15:45:39 -07:00
  • 10952020e0 Update commandline Commit doc Upstream-commit: c20e46587d3fb09257e6ce7d085467da403210ee Component: engine Guillaume J. Charmes 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 Daniel Mizyrycki 2013-05-01 15:25:58 -07:00
  • 44a61f93b3 development; 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
  • 5f26bd9cf3 When 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
  • ac9a4e4b6a New Dockerfile operation 'expose' exposes default tcp ports Upstream-commit: 08812096f580c820d8cd06e3cb2128871551f60f Component: engine Solomon Hykes 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 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
  • b7c2a5f9a1 Actually use the mergeConfig function Upstream-commit: 7ff65d40d557e0a128534c096f3cab0c10a79f7b Component: engine Guillaume J. Charmes 2013-05-01 11:22:06 -07:00
  • 3d70a9f722 added the registry API to the docker docs Upstream-commit: 904c2a0fc353ba08e93decf169baa4ea35fe35a8 Component: engine Ken Cochrane 2013-05-01 12:31:46 -04:00
  • 06f7402ec1 Added dummy script for docker-build example Upstream-commit: a3ce90b78bf5edcacdfd4312e8ec9e25b59d6abb Component: engine Solomon Hykes 2013-05-01 00:49:28 -07:00
  • 44b3ef5d4b Fix example dockerfile Upstream-commit: 03b83b3210865a1981cec43dbc9fe5d24995c060 Component: engine Solomon Hykes 2013-05-01 00:44:36 -07:00
  • 7cc5673df7 new Dockerfile keyword: 'push' Upstream-commit: 40ccf1d30039a7ee975ddb2fc8aa989b1fa680fc Component: engine Solomon Hykes 2013-05-01 00:42:11 -07:00
  • 8fa50ab35a docker-build: added support for 'maintainer' keyword Upstream-commit: 038ca5ee392b974b1ace08d0a6359b02006e6aac Component: engine Solomon Hykes 2013-05-01 00:14:52 -07:00
  • 6179f6bbff Merge pull request #485 from brunoqc/patch-1 Solomon Hykes 2013-04-30 15:46:57 -07:00
  • 4dabc1b080 Merge pull request #488 from tobert/cgroups-via-proc-mounts Guillaume J. Charmes 2013-04-30 14:39:14 -07:00
  • 5f6bf28c14 Improve crashTest Upstream-commit: d97661aa715321a017190bd24870473ac6df34a3 Component: engine Guillaume J. Charmes 2013-04-30 11:16:26 -07:00
  • 500a2c5aa9 Use /proc/mounts instead of mount(8) Al Tobey 2013-04-30 17:37:43 +00:00
  • ccf3ea8fbb [] instead fon null, timetsamps and wip import Upstream-commit: 36b968bb09b72366b21b74439eeba463317d2320 Component: engine Victor Vieux 2013-04-30 17:04:31 +02:00
  • a0f6e6e3a7 Use the 80 port with keyserver.ubuntu.com Bruno Bigras 2013-04-29 15:53:50 -03:00
  • e062adc9ba more accurate http errors, attach handle tty correctly now Upstream-commit: 131c6ab3e6461eb1a985a8eb0a64b59e1b990810 Component: engine Victor Vieux 2013-04-29 17:46:41 +02:00
  • a28a51bb37 working tty Upstream-commit: e5104a4cb4fe68ecd17b5a01ce295c64f8107b42 Component: engine Victor Vieux 2013-04-29 15:12:18 +02:00
  • dbf5127ab9 fix last commit Upstream-commit: 22f5e35579c5cc4bbe191b92517d67a3ae88c2a3 Component: engine Victor Vieux 2013-04-29 11:49:04 +02:00
  • 16af85dc76 run now try to pull if unknown image Upstream-commit: 30cb4b351f3513a6ebec89183def0647346b5708 Component: engine Victor Vieux 2013-04-26 15:08:33 +02:00
  • 89bd2e658f Improve crashTest Upstream-commit: cdc2657ee9bdb1464a17d9daecc0659297d0ee83 Component: engine Guillaume J. Charmes 2013-04-28 07:10:58 -07:00
  • cba2c66321 Simplify the crashTest Upstream-commit: 76a1a7cf5ba2d2db2c7e5873df529f3f956a2156 Component: engine Guillaume J. Charmes 2013-04-28 06:23:02 -07:00
  • 8f8a9ec275 add network endpoint for crashTest Upstream-commit: 20c2a4f80f4171ffb59ea61bdcf57d8edc970fa8 Component: engine Guillaume J. Charmes 2013-04-28 03:54:22 -07:00
  • d9ff34c9b9 Update the crashTest to have the dockerpath in env Upstream-commit: ebe157ebb567965e05cca45a1221cd36ec48a052 Component: engine Guillaume J. Charmes 2013-04-28 01:27:56 -07:00
  • 690c07c3c7 Merge pull request #484 from tianon/mkimage-debian Solomon Hykes 2013-04-29 12:12:02 -07:00
  • eb1c306ba5 Use 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
  • 236d6db8f3 Improve 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
  • 91fa0f0669 Move the capabilities detection into a runtime method Upstream-commit: 9042535f5af607f2362fa3f995427e1c5aab664e Component: engine Guillaume J. Charmes 2013-04-26 14:32:55 -07:00
  • eb3034a4cf Merge pull request #473 from dotcloud/26-auto_restart_containers-feature Guillaume J. Charmes 2013-04-26 14:02:01 -07:00
  • 79019a5e64 Merge pull request #467 from dotcloud/improve_localhost_port_test Guillaume J. Charmes 2013-04-26 14:01:13 -07:00
  • 99df381d5a Merge pull request #478 from tianon/mkimage-debian Guillaume J. Charmes 2013-04-26 13:51:47 -07:00
  • c7ffdd6f90 Remove -command in CmdCommit and make -config use Json Upstream-commit: ae97477284fade20520b5991709d6b65d5fd4442 Component: engine Guillaume J. Charmes 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 Tianon Gravi 2013-04-26 08:54:29 -06:00
  • 800f7e1974 run now try to pull if unknown image Upstream-commit: a48eb4dff869631221854bb85380c15bf7b9d0eb Component: engine Victor Vieux 2013-04-26 15:08:33 +02:00
  • c249b82cb8 Merge pull request #474 from brianm/vmware_fusion_provider Solomon Hykes 2013-04-26 01:31:11 -07:00
  • 43ca41eddd Add TestCommitAutoRun Upstream-commit: 30d327d37ecca58a41f4a370b581ee638ed3ff04 Component: engine Guillaume J. Charmes 2013-04-25 17:03:13 -07:00
  • f98f16c605 Update 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
  • 45f51cdc1d Implement -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
  • 8dd14227bf don't fight the box kernel version, not worth it Upstream-commit: 4db680fda47306586819a41b80a9a2f6a67f0eb9 Component: engine Brian McCallister 2013-04-25 06:29:13 -06:00
  • 73e8a87234 get aufs dependencies into vmware image Upstream-commit: 9c7293508dd849bf9086b5095b7412214d56b801 Component: engine Brian McCallister 2013-04-25 06:09:04 -06:00
  • 876724f84b vmware fusion provider config Upstream-commit: 9d8743a7aed88083b1a7c24a1a684e7a79108c15 Component: engine Brian McCallister 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 Guillaume J. Charmes 2013-04-24 19:01:23 -07:00
  • 5b920253cc Specify 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
  • 3f0eb64040 Merge pull request #466 from dotcloud/441-vagrant-improve Solomon Hykes 2013-04-24 17:25:20 -07:00
  • d5b0d2fd8e vagrant; issue #441: Improve main config including aws ubuntu lts dependency Upstream-commit: 2726e3649a204d15dcf79d2709e6457b6ca50c14 Component: engine Daniel Mizyrycki 2013-04-23 09:44:09 -07:00
  • d1c7705ab6 fixed inspect Upstream-commit: 75c0dc9526766719f6e528c48e63001596042071 Component: engine Victor Vieux 2013-04-24 18:50:26 +02:00
  • 71e24d7094 added export Upstream-commit: c7bbe7ca797ad2f4eb0fff3d58e8eaaa72756036 Component: engine Victor Vieux 2013-04-24 16:32:51 +02:00
  • 74f09dee81 added commit Upstream-commit: 79512b2a8025184d647de61cdd6a19ebadd17a49 Component: engine Victor Vieux 2013-04-24 16:06:03 +02:00
  • 6a51f02794 changed 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
  • 2bbe465e70 Bumped version to 0.2.0 Upstream-commit: 90668a8a997c5db27ffdcc25c7921c63526b62f4 Component: engine Solomon Hykes 2013-04-23 23:15:09 -07:00
  • 71db175e3e Merge branch 'master' of ssh://github.com/dotcloud/docker Upstream-commit: c7fd84b8a0bcfe70c3897e6611e6c59fd514d28f Component: engine Solomon Hykes 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 Solomon Hykes 2013-04-23 23:04:54 -07:00
  • 9417414b7f Merge branch 'master' of ssh://github.com/dotcloud/docker Upstream-commit: 370fafacbfffefe92e48a354db1665400f3f7056 Component: engine Solomon Hykes 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 Solomon Hykes 2013-04-23 22:57:34 -07:00
  • 1d1c2c4078 Merge pull request #427 from dhrp/docs Solomon Hykes 2013-04-23 19:49:28 -07:00
  • a2804cedc1 Merge pull request #470 from dotcloud/packaging-ubuntu Solomon Hykes 2013-04-23 19:46:56 -07:00
  • f829dbfdd6 Makefile improvements Solomon Hykes 2013-04-23 19:41:38 -07:00
  • 0fbc38af42 Fix 'make release RELEASE_VERSION=master' Upstream-commit: 8b8c8bf7cb0ed782d727440a0f2c59d464971353 Component: engine Solomon Hykes 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 Solomon Hykes 2013-04-23 18:32:59 -07:00
  • 11495ebf7e packaging-ubuntu: update maintainer documentation for changelog file Upstream-commit: f744cfd5a75e3b1565740c2f266dbfdf7be8727a Component: engine Daniel Mizyrycki 2013-04-23 13:51:03 -07:00
  • 580d68b08c dockerbuilder: build with 'make; cp -R ./bin' Upstream-commit: e03b241fb18fa5dab4ec94c3d86eacb21601ac66 Component: engine Solomon Hykes 2013-04-23 12:07:54 -07:00
  • 5cff06982a Fixed remaining issues and conflicts created by last merge. Upstream-commit: 1ddca1948bbfd77ad3c4f0eeda640c39d315d9ae Component: engine Thatcher Peskens 2013-04-23 12:04:53 -07:00
  • 2e5e342257 dockerbuilder: 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
  • 7dad97c027 Remove unecessary memeory limit within tests Upstream-commit: 6ebb2491314afb3be4b0b82d14ddba743ec460de Component: engine Guillaume J. Charmes 2013-04-23 11:25:16 -07:00
  • 7a87a87114 Improve TestMultipleAttachRestart to avoid unnecessary warning Upstream-commit: c45beabcd54090bcb31eaa7a5af5878262b7b0e5 Component: engine Guillaume J. Charmes 2013-04-23 11:22:30 -07:00
  • 27ad61c153 Wait 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
  • b74a205fb6 Make 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
  • fd63b71156 dockerbuilder: build in current directory instead /go and /tmp Upstream-commit: 7577f48dc441d14cb600b799498f29f9b4639ffe Component: engine Solomon Hykes 2013-04-23 10:53:02 -07:00
  • 9091b2150c dockerbuilder: /usr/local/bin is already set by docker Upstream-commit: 0512cf9c839be2c5370830cb80bcbec400273eac Component: engine Solomon Hykes 2013-04-23 10:49:58 -07:00
  • f9222f5820 Increased 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
  • efa5049675 added 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
  • af7d46bbb8 Merge pull request #465 from shamrin/patch-2 Solomon Hykes 2013-04-23 09:02:19 -07:00
  • 7f9b606ce0 fixed typo in buildingblocks.rst Upstream-commit: cbc4eccd50ac80ff6e21caeb386328f8a5fcfaff Component: engine Alexey Shamrin 2013-04-23 12:52:55 +04:00
  • 48b5752bf3 Merge pull request #464 from tianon/patch-1 Solomon Hykes 2013-04-23 00:36:10 -07:00
  • c681f7de93 Merge pull request #462 from dotcloud/initial_changelog Solomon Hykes 2013-04-23 00:32:25 -07:00
  • f62367f034 Completed Changelog for all past versions Upstream-commit: 4f6cc5c7330a7389d558dece2e432f13249bd565 Component: engine Solomon Hykes 2013-04-23 00:30:18 -07:00
  • f318096044 Update 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
  • 054b038e78 hack/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
  • e294fd1dc7 Bumped version to 0.1.8 Upstream-commit: 97badbd29e15296b2b4cb55b01246f658c5e9de6 Component: engine Solomon Hykes 2013-04-22 22:04:57 -07:00
  • 28e13570bc Merge remote-tracking branch 'dotcloud/master' into dhrp/docs Thatcher Peskens 2013-04-22 18:44:50 -07:00
  • 5e92f87f4e Merged changes Upstream-commit: 4031a01af1658225344af04be0dbd4225893c242 Component: engine Thatcher Peskens 2013-04-22 18:38:42 -07:00
  • 2d0236d1b1 Merge pull request #463 from dotcloud/improve_pid_file_feature Guillaume J. Charmes 2013-04-22 18:24:03 -07:00
  • e45cc3d0d4 Merge pull request #442 from dotcloud/fix_deleted_file_diff Guillaume J. Charmes 2013-04-22 18:23:46 -07:00
  • 5b94f91912 Merge pull request #456 from dotcloud/453-generic_kernel_detection-fix Guillaume J. Charmes 2013-04-22 18:20:17 -07:00
  • 56cb20082e Make kernel detection work without suffix Upstream-commit: c05c91ca3bb69d2c9faa0a2b15bc23b7c2a7bd8a Component: engine Guillaume J. Charmes 2013-04-22 13:19:50 -07:00
  • 51acd7e848 Forbid attach to ghost Upstream-commit: b76d63cb0c97aacec6d81c07108d2a573fb8af05 Component: engine Guillaume J. Charmes 2013-04-19 14:18:03 -07:00
  • af6dece8d5 Allow to kill/stop ghosts Upstream-commit: f926ed182f908aba20980202becfcdbe2d1e9c34 Component: engine Guillaume J. Charmes 2013-04-19 12:21:39 -07:00
  • ffa41c520d Allow to kill container after docker server restarts Upstream-commit: d440782e17d384d52c813f93cd53d2d8a15fd13a Component: engine Guillaume J. Charmes 2013-04-19 12:12:30 -07:00
  • e0f172a6ff Allow 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
  • 9868eec5a4 Add unit test for file deletion Upstream-commit: 97535e5a6466dcad6ed9767960e869eadf68204f Component: engine Guillaume J. Charmes 2013-04-22 17:51:09 -07:00
  • 2a6be2d202 Check 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
  • 494b53d7fc Merge pull request #457 from shamrin/patch-1 Guillaume J. Charmes 2013-04-22 15:40:03 -07:00