Commit Graph

  • a130f465ad Fix merge issue Upstream-commit: d91d0da45310a4ab8d6124b70a1f541352149bdc Component: engine creack 2013-03-12 08:59:32 -07:00
  • c4a0001d99 Merge master within fs creack 2013-03-12 08:33:21 -07:00
  • d895b3a7f8 Automatically remove the rcfile generated by docker -i from /tmp Louis Opter 2013-03-12 12:12:40 -07:00
  • ddc08abc64 Merge master within fs Upstream-commit: c4a0001d99 Component: cli creack 2013-03-12 08:33:21 -07:00
  • cf4a1a8ac7 Automatically remove the rcfile generated by docker -i from /tmp Upstream-commit: d895b3a7f8 Component: cli Louis Opter 2013-03-12 12:12:40 -07:00
  • d6cad8aba4 Merge master within fs Upstream-commit: 150a4fe7e5aaa5d733130e22eac09cb36ffadd82 Component: engine creack 2013-03-12 08:33:21 -07:00
  • 6d294cf990 Merge pull request #58 from lopter/master Solomon Hykes 2013-03-12 12:15:34 -07:00
  • ec87b553c7 Automatically remove the rcfile generated by docker -i from /tmp Upstream-commit: b2de17bf2cfdf90f347109452bcb8763138cff46 Component: engine Louis Opter 2013-03-12 12:12:40 -07:00
  • b085b8597c Merge pull request #57 from kencochrane/vagrant-fix Solomon Hykes 2013-03-12 12:10:17 -07:00
  • 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 -07:00
  • 0e7bc1161e Merge pull request #48 from dotcloud/memorylimits Solomon Hykes 2013-03-12 12:02:49 -07:00
  • 7bcb8dcb89 Merge remote-tracking branch 'remotes/chooper/help-ux' Upstream-commit: 2d32dca9e7616fdd007caf953f70a96a140237a4 Component: engine Solomon Hykes 2013-03-12 11:11:33 -07:00
  • 1957f767a1 Merge pull request #53 from jpetazzo/cloudinit Solomon Hykes 2013-03-12 10:31:01 -07:00
  • b907ad129d Merge pull request #43 from kencochrane/vagrant-fix Solomon Hykes 2013-03-12 10:30:08 -07:00
  • 8990ed16c8 Add *.orig to .gitignore Upstream-commit: 6908628b555a1583f079f04ed34f5d81ce917459 Component: engine creack 2013-03-12 08:06:22 -07:00
  • 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 -07:00
  • 422044f5c5 'docker run' works with paths as well as image IDs Upstream-commit: de50c9c4e8d0276890cfb521e5b57da58cf470aa Component: engine shin- 2013-03-12 05:57:19 -07:00
  • 22687838eb gofmt Upstream-commit: 45a8bba15e95b789c12a371036aa1ad42357dc08 Component: engine Guillaume J. Charmes 2013-03-12 05:36:37 -07:00
  • 090804e18e Add TestCommitRun unit test Upstream-commit: f2dc079c05c073d63b10a3c2a2bc784d1e94e82c Component: engine Guillaume J. Charmes 2013-03-12 05:35:47 -07:00
  • 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 -07:00
  • ab1211bcb8 Put back the relative paths for dev purpose Guillaume J. Charmes 2013-03-12 05:17:51 -07:00
  • 45ad596952 Put back the relative paths for dev purpose Upstream-commit: ab1211bcb8 Component: cli Guillaume J. Charmes 2013-03-12 05:17:51 -07:00
  • b9140244d5 Put back the relative paths for dev purpose Upstream-commit: 18f4e7e196eb894765094c1291e1a1f6599f4266 Component: engine Guillaume J. Charmes 2013-03-12 05:17:51 -07:00
  • 82c8224ed4 Merge branch 'fs' of github.com:dotcloud/docker into fs Upstream-commit: 8158616d6133bbe71ad33b4a2be06664e038b8d0 Component: engine shin- 2013-03-12 04:29:06 -07:00
  • 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 -07:00
  • 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 -07:00
  • 26e8bc9499 Add script upload instructions Upstream-commit: b728c1a81fbb441442d635788e814d47436c613f Component: engine Jérôme Petazzoni 2013-03-11 23:37:38 -07:00
  • a66dcb2cd8 Get rid of bashism Upstream-commit: f90f6a0b9248489c43188ca79b9e0dfc306fd8dc Component: engine Jérôme Petazzoni 2013-03-11 23:13:08 -07:00
  • 5959f3618b Try to load, or install, AUFS modules Jérôme Petazzoni 2013-03-11 23:09:19 -07:00
  • dae5183be0 Use "start" instead of "restart" Jérôme Petazzoni 2013-03-11 23:08:21 -07:00
  • b0e2cf6a60 Stream and unpack the tarball on the fly Jérôme Petazzoni 2013-03-11 23:07:16 -07:00
  • 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 +00:00
  • d195c6fc42 Add missing shebang jpetazzo 2013-03-11 19:03:22 -07:00
  • 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 +00:00
  • c1226e5612 Replaced 'pull' and 'put' with 'import' Upstream-commit: 132ecb24822072c82718d47ac23da62a8ea774fc Component: engine Solomon Hykes 2013-03-11 21:04:16 -07:00
  • 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 +00:00
  • f7b883233d Pull missing images on run. Addresses #31. Charles Hooper 2013-03-12 02:58:39 +00:00
  • 57b34e832a Missed a rename Upstream-commit: f8fee421819e3c272e1c20890da7c90b4da971ad Component: engine Sam Alba 2013-03-11 19:55:14 -07:00
  • 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 -07:00
  • 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 -07:00
  • ac42ba1efc Implemented unit tests for the generated LXC config Upstream-commit: 4e5ae883722ad814ef19e3f9d333f6218db752a5 Component: engine Sam Alba 2013-03-11 19:15:29 -07:00
  • 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 -07:00
  • 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 -07:00
  • 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 -07:00
  • 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 -07:00
  • 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 +00:00
  • 3fc19b598b Complete fix for #38 -- fix double-usage on help Upstream-commit: a7cb3cb86a39f950a517b61e3a674e0cd080804f Component: engine Charles Hooper 2013-03-11 22:29:13 +00:00
  • dd314eeb8b Fix CmdInspect and CmdImages help/parsing. Fixes #38 Upstream-commit: 06d420d2ead65cb5af760d7946d8844f568f4d65 Component: engine Charles Hooper 2013-03-11 22:08:22 +00:00
  • 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 -07:00
  • 39ad2cf8d3 Change relative paths to absolute Guillaume J. Charmes 2013-03-11 02:59:52 -07:00
  • b4b078c5ae post-merge repairs shin- 2013-03-11 07:39:06 -07:00
  • 04adbcb80c Merged upstream changes in fs branch shin- 2013-03-11 05:50:09 -07:00
  • 4b2bbc5754 Change relative paths to absolute Upstream-commit: 39ad2cf8d3 Component: cli Guillaume J. Charmes 2013-03-11 02:59:52 -07:00
  • 82b549063d post-merge repairs Upstream-commit: b4b078c5ae Component: cli shin- 2013-03-11 07:39:06 -07:00
  • 74886786d3 Merged upstream changes in fs branch Upstream-commit: 04adbcb80c Component: cli shin- 2013-03-11 05:50:09 -07:00
  • c28aedcbf3 Change relative paths to absolute Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d Component: engine Guillaume J. Charmes 2013-03-11 02:59:52 -07:00
  • 3720d832c1 post-merge repairs Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6 Component: engine shin- 2013-03-11 07:39:06 -07:00
  • 7c2c4d6c33 Merged upstream changes in fs branch Upstream-commit: 2441edf1a39ad75708292bcc2726184b16fb89b2 Component: engine shin- 2013-03-11 05:50:09 -07:00
  • 347532ed43 Merged master branch into fs Upstream-commit: 97a8209438dcc60395b244c14f4efced583eb364 Component: engine shin- 2013-03-11 05:42:36 -07:00
  • fae9969603 Removed deprecated docker/image package Upstream-commit: dd0227b700503e03fce0e9e9ea3539c438e9c0cb Component: engine Solomon Hykes 2013-03-09 20:17:31 -08:00
  • 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 -08:00
  • 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 -08:00
  • 3de7ff271c gofmt Solomon Hykes 2013-03-09 19:44:09 -08:00
  • 07e40068fc gofmt Upstream-commit: 3de7ff271c Component: cli Solomon Hykes 2013-03-09 19:44:09 -08:00
  • 279f7946e3 gofmt Upstream-commit: c59fff422fdc61c1c994b44fd83e4173a2f0530a Component: engine Solomon Hykes 2013-03-09 19:44:09 -08:00
  • 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 -08:00
  • 5aae786a89 Setup a predictable, repeatable environment for containers Upstream-commit: fb350e0c7705850cc78e1dc1dc63b56aca06c3cc Component: engine Solomon Hykes 2013-03-07 09:25:41 -08:00
  • 4ec7273fca Container logs are persisted on disk Upstream-commit: 2df0bc6bc0df53c7657404a92fb8f256b7109de0 Component: engine Solomon Hykes 2013-03-06 16:08:44 -08:00
  • 4f3545b3a6 Merge branch 'master' of ssh://github.com/dotcloud/docker Upstream-commit: 007c57deba0d2ceb1fe6bcf90fd7621e79855651 Component: engine Solomon Hykes 2013-03-06 00:39:35 -08:00
  • 35ee9964bb docker port: lookup public-facing tcp ports for a container Upstream-commit: 410ebe379dbf60d8fd75ba695e4e8036fdba6b65 Component: engine Solomon Hykes 2013-03-06 00:39:03 -08:00
  • 9e8c334ba7 Remove leftover debug message Upstream-commit: 791592731eccfae0072b20a80d15ec31e34dc88f Component: engine Solomon Hykes 2013-03-06 00:37:00 -08:00
  • 664b07c397 Moved Vagrant guide to the wiki Solomon Hykes 2013-03-05 22:44:09 -08:00
  • c114400a94 docker rmi -r: remove all images matching a regexp Upstream-commit: 74c88fdbc0180c276f75322066e7da2e3cd38f6d Component: engine Solomon Hykes 2013-03-05 22:39:43 -08:00
  • fe79db830e Reorganized README Solomon Hykes 2013-03-05 16:00:17 -08:00
  • 9cfa2c197b Updated README: networking no longer "coming soon" Upstream-commit: 9f3b1a8ee05852fe41ddfba2b4765656d3e54805 Component: engine Solomon Hykes 2013-03-05 15:58:27 -08:00
  • ee6308efa8 Updated install instructions and download links Solomon Hykes 2013-03-01 17:21:26 -08:00
  • e64fe2c171 Merge pull request #23 from dotcloud/networking Solomon Hykes 2013-02-28 16:32:55 -08:00
  • b8e54f45cd Re-enabled CmdPull progress bar code which had been temporarily disabled Upstream-commit: 5675439b9100b40529b8eb87447231a2f5a01ad2 Component: engine Solomon Hykes 2013-02-28 16:30:31 -08:00
  • ba5971c0a7 Re-enabled lxc capabilities drop Upstream-commit: 2192d3371ceb7431a6dacd170ddadd4ef26d5783 Component: engine Andrea Luzzardi 2013-02-28 11:57:57 -08:00
  • 7bb4e569d5 Merge branch 'master' into networking Upstream-commit: f62344b75053fbfaf66246c2cb3e20577e317ce4 Component: engine Andrea Luzzardi 2013-02-28 11:52:52 -08:00
  • db9b80be91 Server: -p option to export TCP ports Upstream-commit: f857fa0dddbf48b959b0876582027ebc46dc5e9e Component: engine Andrea Luzzardi 2013-02-28 11:52:22 -08:00
  • 524643db0f Docker: Network manager integration Upstream-commit: bd2f51290f4c34daec08474c0bd78952030be6ff Component: engine Andrea Luzzardi 2013-02-28 11:52:07 -08:00
  • 65fd63e26d Container can now take a list of ports to expose in its config Upstream-commit: 09eacdfadec36f79cec74f037484b10ddfae6791 Component: engine Andrea Luzzardi 2013-02-28 11:51:14 -08:00
  • 3cddff121d Network: Port mapping support. Implemented a port allocator and a port mapper that is able to forward TCP ports from the host to the container. Upstream-commit: 799ffa176399877e610ff2049dbf84610037a2be Component: engine Andrea Luzzardi 2013-02-28 11:50:02 -08:00
  • 58a8b7bd53 Update puppet/modules/docker/manifests/init.pp Daniel Mizyrycki 2013-02-26 18:17:51 -08:00
  • 9a491da582 Merge branch 'master' into fs Upstream-commit: ffbb9c8e4a1b7c98bbb602a8428376e4a41214d3 Component: engine shin- 2013-02-26 17:45:55 -08:00
  • 4c53a7568f Halfway through fs branch fixes, TestUser not passing Upstream-commit: 2ebf3464a1ed5bf32e33eff45cfa8e8394b5cd43 Component: engine shin- 2013-02-26 17:45:46 -08:00
  • a736616ad1 Merge from master Upstream-commit: c7f4602b184ec2cab594dfeaf73bed09aa39a749 Component: engine Andrea Luzzardi 2013-02-26 17:32:07 -08:00
  • b9049f5277 Changed .gitignore to not match docker/*.go Upstream-commit: 278aa5f045ad6dd8718933b4736c29567a17717a Component: engine Solomon Hykes 2013-02-26 17:29:11 -08:00
  • ee05cc5bbc If curl is installed, 'docker pull' will use it to download images with a pretty progress bar. Otherwise it will fallback to regular http.Get() Upstream-commit: 003ec21d360b08d50b61834795692542fff295e2 Component: engine Solomon Hykes 2013-02-26 17:28:24 -08:00
  • df5134f46e go fmt Solomon Hykes 2013-02-26 17:26:46 -08:00
  • 034971c8ee go fmt Upstream-commit: df5134f46e Component: cli Solomon Hykes 2013-02-26 17:26:46 -08:00
  • d2bed9b75c go fmt Upstream-commit: aa12da6f5076738955b30470639d439a0cbe40f9 Component: engine Solomon Hykes 2013-02-26 17:26:46 -08:00
  • 9ff14257ee Updated pybuilder example to use 'docker wait' Upstream-commit: 4004e86fa9ca87332c8f5fa0acbe29af86e06908 Component: engine Solomon Hykes 2013-02-26 14:47:20 -08:00
  • 3caf4d4dd5 docker wait: block until a container exits, and print its exit code Upstream-commit: ebaa50c4c96a1ba69e480fab5612b5d6a97da145 Component: engine Solomon Hykes 2013-02-26 11:43:54 -08:00
  • 4ea244cb65 Merge branch 'master' into networking Upstream-commit: 3c0a59f03873e5c062ef0d39267341dd5f5e6bca Component: engine Andrea Luzzardi 2013-02-26 11:04:28 -08:00
  • c483fcc71c Merge branch 'master' into networking Upstream-commit: 2c2db5cd45f3281954211dc72a4412f5b611ad24 Component: engine Andrea Luzzardi 2013-02-26 11:03:11 -08:00
  • c9db276294 New example: pybuilder Upstream-commit: 8fa07c0e060a25141204533a2a3823d1cb0fdf63 Component: engine Solomon Hykes 2013-02-26 10:03:06 -08:00
  • 471e62f72d Added tests for checksum computation in layer store Upstream-commit: 6d1054619d6d254ea3df0484cacb3c6778d58cd9 Component: engine Solomon Hykes 2013-02-26 09:46:29 -08:00
  • 6bc8a20d54 Integrated the network allocator into Docker. A networking environment is assigned to each container upon Start and released whenever the container exits. Upstream-commit: c08f5b2b8460f13f2094bae2a496bf308f7645bb Component: engine Andrea Luzzardi 2013-02-25 14:06:22 -08:00