Commit Graph

  • fc32abb2ec Add fixme for the change detection Upstream-commit: 804abddec155dedc42e99ad746f1cf1fdbfe0fed Component: engine Guillaume J. Charmes 2013-03-13 13:03:29 -0700
  • c9f922121d Merge branch 'master' into pull-missing Upstream-commit: 8c2ff9374c3a0770689f042fead5a413cc68428a Component: engine Charles Hooper 2013-03-13 19:51:08 +0000
  • 438afadedb Merge branch 'master' into pull-missing Charles Hooper 2013-03-13 18:33:48 +0000
  • b449cc4a56 Merge branch 'master' into 32-aufs_delete_fix Upstream-commit: 77272bea9c7326e53c625ea22b3676e44abfe271 Component: engine creack 2013-03-13 01:18:55 -0700
  • 592f910731 Merged branch 28-standalone Upstream-commit: 89245360e89d725f7c7487dc8cf35836a12eabb8 Component: engine Solomon Hykes 2013-03-13 12:23:37 -0700
  • 8e04b25bbd Fixed formatting in README Upstream-commit: 8d5f683dc47795f6797eb14b498149c612398bd2 Component: engine Solomon Hykes 2013-03-13 12:00:13 -0700
  • 1c95edd498 Added usage exmaples to the README Upstream-commit: d614e91b62339d1960cf171c2436404bb1fa8806 Component: engine Solomon Hykes 2013-03-13 11:58:15 -0700
  • bea2df9aa0 Updated README Upstream-commit: baf6988d872be24130fc2923bef227f5365cbf1b Component: engine Solomon Hykes 2013-03-13 11:46:09 -0700
  • 905dafaf18 README: removed superfluous install step Upstream-commit: 895e145e615b407aa485189a8021fd8640700163 Component: engine Solomon Hykes 2013-03-13 11:28:52 -0700
  • 8bc8fc57bc Merge branch 'master' of ssh://github.com/dotcloud/docker Upstream-commit: 41e0c74fd08afb5007320b60b9fe94958dc16155 Component: engine Solomon Hykes 2013-03-13 11:27:23 -0700
  • 22fe870560 Moved download binaries to get.docker.io Upstream-commit: d54ff35f022e5e11c5ca124237a1888c4a6161b9 Component: engine Solomon Hykes 2013-03-13 11:27:06 -0700
  • 06c0237124 Re-enabled docker rmi Upstream-commit: c3622a963d326df8da8049302e0f2ea4875fc496 Component: engine shin- 2013-03-13 11:14:37 -0700
  • 57f43a3fe4 Fix issue #32, aufs now take into consideration deleted files Upstream-commit: 7cc512c7c065fe52125fe7d6f045d0248d16de80 Component: engine creack 2013-03-13 01:17:03 -0700
  • b5dcd430d5 Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon Upstream-commit: 7f13a9cf3a Component: cli Solomon Hykes 2013-03-13 00:29:40 -0700
  • 7f13a9cf3a Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon Solomon Hykes 2013-03-13 00:29:40 -0700
  • 621d110d7f Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon Upstream-commit: 745edc49cdcf0dc02fe714b0772f146fc8a66d23 Component: engine Solomon Hykes 2013-03-13 00:29:40 -0700
  • a59a03bb59 Merged master Upstream-commit: a790f96feb Component: cli Solomon Hykes 2013-03-12 21:53:34 -0700
  • a790f96feb Merged master Solomon Hykes 2013-03-12 21:53:34 -0700
  • 95b2e5b159 Merged master Upstream-commit: 86854ffbc5423597d11932eb904cb6fe7dedcac9 Component: engine Solomon Hykes 2013-03-12 21:53:34 -0700
  • 906eecfc45 Merged version option by @kencochrane Upstream-commit: 070bc0bb6d316a2a023161a19cba667831a26698 Component: engine Solomon Hykes 2013-03-12 20:59:47 -0700
  • 9a8e1b4a6b fixed formatting issue Upstream-commit: e20a74d2477ea3feb7a9734c15b645d081dbebdf Component: engine Ken Cochrane 2013-03-12 17:34:15 -0700
  • 1fa0ca8238 Add makefile Upstream-commit: c017c7baa41e6f9ce03c18228e1a950cf5bdba3a Component: engine Jeremy Grosser 2013-03-13 00:25:11 +0000
  • 0f125b7a99 Remove Curl function from future Upstream-commit: b0265e0a38a71fdbebf3b6ef53120249d399e293 Component: engine Charles Hooper 2013-03-12 23:06:07 +0000
  • d2cb3c42c7 Only update download/untar progress every 1%. Related to #49 Upstream-commit: b5c1cd7991b3b7ea81665b06ad1dd4cb1c8d8b0f Component: engine Charles Hooper 2013-03-12 23:02:50 +0000
  • 4bba3014fc Fix "no such image" bug in docker run, introduced last commit. Ref #49,#50 Upstream-commit: 2feefb43758e2477b70044e73ed0d800453fe8de Component: engine Charles Hooper 2013-03-12 22:13:21 +0000
  • 016ee497a3 Add native Go downloading functionality with progress bar. Ref #49, #50 Upstream-commit: 1bfd827701d80a40e65509d45abaa61cd5c748ec Component: engine Charles Hooper 2013-03-12 22:08:10 +0000
  • ab2846c881 Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth Upstream-commit: ae5f2d9a56 Component: cli Solomon Hykes 2013-03-12 15:05:41 -0700
  • ae5f2d9a56 Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth Solomon Hykes 2013-03-12 15:05:41 -0700
  • 547e13b585 Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth Upstream-commit: d2cba75d5f1e8ceea7f301ef146c571806252fa0 Component: engine Solomon Hykes 2013-03-12 15:05:41 -0700
  • 6041db20fc Add Download method for native Go downloading (to replace curl). Catch 404s. Ref: #49, #50 Upstream-commit: 49554f47f60568c3df942f274ab45d92f451fbcc Component: engine Charles Hooper 2013-03-12 20:50:11 +0000
  • f9945bccac Put back the github.com path for the import Upstream-commit: 20c2c684b2 Component: cli creack 2013-03-12 11:59:27 -0700
  • 20c2c684b2 Put back the github.com path for the import creack 2013-03-12 11:59:27 -0700
  • 35529bba2c Put back the github.com path for the import Upstream-commit: 453d49573c91a1c49ffbc54d040145804e38d91e Component: engine creack 2013-03-12 11:59:27 -0700
  • a130f465ad Fix merge issue Upstream-commit: d91d0da45310a4ab8d6124b70a1f541352149bdc Component: engine creack 2013-03-12 08:59:32 -0700
  • ddc08abc64 Merge master within fs Upstream-commit: c4a0001d99 Component: cli creack 2013-03-12 08:33:21 -0700
  • cf4a1a8ac7 Automatically remove the rcfile generated by docker -i from /tmp Upstream-commit: d895b3a7f8 Component: cli Louis Opter 2013-03-12 12:12:40 -0700
  • c4a0001d99 Merge master within fs creack 2013-03-12 08:33:21 -0700
  • d895b3a7f8 Automatically remove the rcfile generated by docker -i from /tmp Louis Opter 2013-03-12 12:12:40 -0700
  • d6cad8aba4 Merge master within fs Upstream-commit: 150a4fe7e5aaa5d733130e22eac09cb36ffadd82 Component: engine creack 2013-03-12 08:33:21 -0700
  • 6d294cf990 Merge pull request #58 from lopter/master Solomon Hykes 2013-03-12 12:15:34 -0700
  • ec87b553c7 Automatically remove the rcfile generated by docker -i from /tmp Upstream-commit: b2de17bf2cfdf90f347109452bcb8763138cff46 Component: engine Louis Opter 2013-03-12 12:12:40 -0700
  • b085b8597c Merge pull request #57 from kencochrane/vagrant-fix Solomon Hykes 2013-03-12 12:10:17 -0700
  • a31b72360d upgraded kernel to 3.5.0-25 to fix a kernel bug Upstream-commit: 94baf2c5b9b2eb49b554d933f9997da072905d88 Component: engine Ken Cochrane 2013-03-12 12:05:04 -0700
  • 0e7bc1161e Merge pull request #48 from dotcloud/memorylimits Solomon Hykes 2013-03-12 12:02:49 -0700
  • 7bcb8dcb89 Merge remote-tracking branch 'remotes/chooper/help-ux' Upstream-commit: 2d32dca9e7616fdd007caf953f70a96a140237a4 Component: engine Solomon Hykes 2013-03-12 11:11:33 -0700
  • 1957f767a1 Merge pull request #53 from jpetazzo/cloudinit Solomon Hykes 2013-03-12 10:31:01 -0700
  • b907ad129d Merge pull request #43 from kencochrane/vagrant-fix Solomon Hykes 2013-03-12 10:30:08 -0700
  • 8990ed16c8 Add *.orig to .gitignore Upstream-commit: 6908628b555a1583f079f04ed34f5d81ce917459 Component: engine creack 2013-03-12 08:06:22 -0700
  • ee6bd4ea31 Merge branch 'fs' of https://github.com/dotcloud/docker into fs Upstream-commit: d24ce7dfd15b049560f5d06d57c2b7e2c6a5d61a Component: engine Guillaume J. Charmes 2013-03-12 05:37:07 -0700
  • 422044f5c5 'docker run' works with paths as well as image IDs Upstream-commit: de50c9c4e8d0276890cfb521e5b57da58cf470aa Component: engine shin- 2013-03-12 05:57:19 -0700
  • 22687838eb gofmt Upstream-commit: 45a8bba15e95b789c12a371036aa1ad42357dc08 Component: engine Guillaume J. Charmes 2013-03-12 05:36:37 -0700
  • 090804e18e Add TestCommitRun unit test Upstream-commit: f2dc079c05c073d63b10a3c2a2bc784d1e94e82c Component: engine Guillaume J. Charmes 2013-03-12 05:35:47 -0700
  • 7cb2cc835d Add parent when needed on store.Create, fix the mountpoint on store.layer. Upstream-commit: 2664668388bd2b1d7012b863d4f8d426fda17daf Component: engine Guillaume J. Charmes 2013-03-12 05:23:13 -0700
  • 45ad596952 Put back the relative paths for dev purpose Upstream-commit: ab1211bcb8 Component: cli Guillaume J. Charmes 2013-03-12 05:17:51 -0700
  • ab1211bcb8 Put back the relative paths for dev purpose Guillaume J. Charmes 2013-03-12 05:17:51 -0700
  • b9140244d5 Put back the relative paths for dev purpose Upstream-commit: 18f4e7e196eb894765094c1291e1a1f6599f4266 Component: engine Guillaume J. Charmes 2013-03-12 05:17:51 -0700
  • 82c8224ed4 Merge branch 'fs' of github.com:dotcloud/docker into fs Upstream-commit: 8158616d6133bbe71ad33b4a2be06664e038b8d0 Component: engine shin- 2013-03-12 04:29:06 -0700
  • e1030605a9 Re-enabled cat, write and ls ; Added creation date to image metadata Upstream-commit: 63dd8f101816c1253ac8d05e10f4f8a4c80f296a Component: engine shin- 2013-03-12 04:24:26 -0700
  • aee1baf2e0 Add "nuke" function to docker tests to avoid disk space waste Upstream-commit: e0b09d4933a289da01508039995bd627ff1392df Component: engine Guillaume J. Charmes 2013-03-12 00:08:41 -0700
  • 26e8bc9499 Add script upload instructions Upstream-commit: b728c1a81fbb441442d635788e814d47436c613f Component: engine Jérôme Petazzoni 2013-03-11 23:37:38 -0700
  • a66dcb2cd8 Get rid of bashism Upstream-commit: f90f6a0b9248489c43188ca79b9e0dfc306fd8dc Component: engine Jérôme Petazzoni 2013-03-11 23:13:08 -0700
  • 5959f3618b Try to load, or install, AUFS modules Jérôme Petazzoni 2013-03-11 23:09:19 -0700
  • dae5183be0 Use "start" instead of "restart" Jérôme Petazzoni 2013-03-11 23:08:21 -0700
  • b0e2cf6a60 Stream and unpack the tarball on the fly Jérôme Petazzoni 2013-03-11 23:07:16 -0700
  • 55737e88cf Error gracefully when an image is not found on pull. Addresses #50 and comments from #49 Upstream-commit: 8e0986caec91f61e0496e1990a4bec745a9596fc Component: engine Charles Hooper 2013-03-12 05:49:57 +0000
  • d195c6fc42 Add missing shebang jpetazzo 2013-03-11 19:03:22 -0700
  • e585944572 Don't allow images with colons in name and reject pegging versions on pull/import. Addresses #49 and #52 Upstream-commit: b8219b5275f5bbb049e97a1459b87d194878aebc Component: engine Charles Hooper 2013-03-12 04:31:49 +0000
  • c1226e5612 Replaced 'pull' and 'put' with 'import' Upstream-commit: 132ecb24822072c82718d47ac23da62a8ea774fc Component: engine Solomon Hykes 2013-03-11 21:04:16 -0700
  • b4142391ec Use ioutil.NopCloser instead of opening /dev/null for ReadCloser in CmdRun. Related to #31 Upstream-commit: 63edf8a4a1830a939432e369dd075ebade0e03a9 Component: engine Charles Hooper 2013-03-12 03:18:34 +0000
  • f7b883233d Pull missing images on run. Addresses #31. Charles Hooper 2013-03-12 02:58:39 +0000
  • 57b34e832a Missed a rename Upstream-commit: f8fee421819e3c272e1c20890da7c90b4da971ad Component: engine Sam Alba 2013-03-11 19:55:14 -0700
  • bb9fd12cf7 Added -m to the run command in order to set a memory limit to a container Upstream-commit: 3684b67572605de492abba041695bd80ef42bcb5 Component: engine Sam Alba 2013-03-11 19:51:24 -0700
  • 5aded53217 Renamed Container property Ram to Memory before it is too late Upstream-commit: 948961831ab6cfb0c94e1e80552f4438d1f434a7 Component: engine Sam Alba 2013-03-11 19:25:02 -0700
  • ac42ba1efc Implemented unit tests for the generated LXC config Upstream-commit: 4e5ae883722ad814ef19e3f9d333f6218db752a5 Component: engine Sam Alba 2013-03-11 19:15:29 -0700
  • 46579cb546 changed the docker version in vagrant to pull down latest version, moved some things around and put docker and dockerd into /usr/local/bin now. Also added git to install package list Upstream-commit: d4da0a0ddbb3ec1979941bc3d2425aab3a6b3f19 Component: engine Ken Cochrane 2013-03-11 17:48:39 -0700
  • ae1dbfa7df added a fix to the upstart command that wasn't setting hte LOCALE correctly, which was causing issues with UTF-8 bundles Upstream-commit: 43875a73a0c2ee51f8bcd36634bbf64d836df6f8 Component: engine Ken Cochrane 2013-03-11 17:47:28 -0700
  • 934119dc91 Added support for RamSwap in the generated LXC config (to limit the swap and have the right default settings) Upstream-commit: 75d04a5a7561cabba0aaf2875ef4479381096f91 Component: engine Sam Alba 2013-03-11 17:40:54 -0700
  • a52c532fef Fix a bug which caused dockerd to crash at startup if a container didn't have a registered mountpoint Upstream-commit: 2548722dae1be15c61ee8db1a5eaa1d04ba7fcef Component: engine Solomon Hykes 2013-03-11 17:05:01 -0700
  • 77f5ae75a2 Add all commands to the output of 'dotcloud help'. Fixes #39 Upstream-commit: 52b811f50a0906904d688e5fae8f32e1ada90f1a Component: engine Charles Hooper 2013-03-11 23:11:46 +0000
  • 3fc19b598b Complete fix for #38 -- fix double-usage on help Upstream-commit: a7cb3cb86a39f950a517b61e3a674e0cd080804f Component: engine Charles Hooper 2013-03-11 22:29:13 +0000
  • dd314eeb8b Fix CmdInspect and CmdImages help/parsing. Fixes #38 Upstream-commit: 06d420d2ead65cb5af760d7946d8844f568f4d65 Component: engine Charles Hooper 2013-03-11 22:08:22 +0000
  • 4fa07b4e3a Set the memory soft limit to the same value than the hard limit Upstream-commit: a3a946703ba93e7d937680897ed89eb99c52acef Component: engine Sam Alba 2013-03-11 14:28:11 -0700
  • 4b2bbc5754 Change relative paths to absolute Upstream-commit: 39ad2cf8d3 Component: cli Guillaume J. Charmes 2013-03-11 02:59:52 -0700
  • 82b549063d post-merge repairs Upstream-commit: b4b078c5ae Component: cli shin- 2013-03-11 07:39:06 -0700
  • 74886786d3 Merged upstream changes in fs branch Upstream-commit: 04adbcb80c Component: cli shin- 2013-03-11 05:50:09 -0700
  • 39ad2cf8d3 Change relative paths to absolute Guillaume J. Charmes 2013-03-11 02:59:52 -0700
  • b4b078c5ae post-merge repairs shin- 2013-03-11 07:39:06 -0700
  • 04adbcb80c Merged upstream changes in fs branch shin- 2013-03-11 05:50:09 -0700
  • c28aedcbf3 Change relative paths to absolute Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d Component: engine Guillaume J. Charmes 2013-03-11 02:59:52 -0700
  • 3720d832c1 post-merge repairs Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6 Component: engine shin- 2013-03-11 07:39:06 -0700
  • 7c2c4d6c33 Merged upstream changes in fs branch Upstream-commit: 2441edf1a39ad75708292bcc2726184b16fb89b2 Component: engine shin- 2013-03-11 05:50:09 -0700
  • 347532ed43 Merged master branch into fs Upstream-commit: 97a8209438dcc60395b244c14f4efced583eb364 Component: engine shin- 2013-03-11 05:42:36 -0700
  • fae9969603 Removed deprecated docker/image package Upstream-commit: dd0227b700503e03fce0e9e9ea3539c438e9c0cb Component: engine Solomon Hykes 2013-03-09 20:17:31 -0800
  • c015b59ef3 Fixed a bug which caused dockerd to not create its DB if an empty /var/lib/docker/images existed; fixed a bug which caused dockerd to not create missing tables in the images DB. Upstream-commit: b5b2f005eb679d0224db407ad1e9320be361640a Component: engine Solomon Hykes 2013-03-09 19:56:33 -0800
  • f836da6c3f Fixed a bug which caused docker to crash at startup while restoring existing containers Upstream-commit: 4474cd5677751ee5acac0525953eea583f797a1b Component: engine Solomon Hykes 2013-03-09 19:49:09 -0800
  • 07e40068fc gofmt Upstream-commit: 3de7ff271c Component: cli Solomon Hykes 2013-03-09 19:44:09 -0800
  • 3de7ff271c gofmt Solomon Hykes 2013-03-09 19:44:09 -0800
  • 279f7946e3 gofmt Upstream-commit: c59fff422fdc61c1c994b44fd83e4173a2f0530a Component: engine Solomon Hykes 2013-03-09 19:44:09 -0800
  • 44192a1329 Plugged in image store in front-end (some commands are deactivated right now, will progressively reintroduce them Upstream-commit: 93ba6dd82bb62dbb9cac729cfa6626c469a87d00 Component: engine shin- 2013-03-08 10:48:22 -0800
  • 5aae786a89 Setup a predictable, repeatable environment for containers Upstream-commit: fb350e0c7705850cc78e1dc1dc63b56aca06c3cc Component: engine Solomon Hykes 2013-03-07 09:25:41 -0800