Commit Graph

282 Commits

Author SHA1 Message Date
Solomon Hykes f5f26a510f 'docker inspect' supports pinned versions again (eg. 'docker inspect PATH:revision') 2013-03-13 13:23:59 -07:00
Solomon Hykes 89245360e8 Merged branch 28-standalone 2013-03-13 12:23:37 -07:00
Solomon Hykes 8d5f683dc4 Fixed formatting in README 2013-03-13 12:00:13 -07:00
Solomon Hykes d614e91b62 Added usage exmaples to the README 2013-03-13 11:58:15 -07:00
Solomon Hykes baf6988d87 Updated README 2013-03-13 11:46:09 -07:00
Solomon Hykes 895e145e61 README: removed superfluous install step 2013-03-13 11:28:52 -07:00
Solomon Hykes 41e0c74fd0 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-03-13 11:27:23 -07:00
Solomon Hykes d54ff35f02 Moved download binaries to get.docker.io 2013-03-13 11:27:06 -07:00
shin- c3622a963d Re-enabled docker rmi 2013-03-13 11:14:37 -07:00
Solomon Hykes 745edc49cd 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 2013-03-13 00:29:40 -07:00
Solomon Hykes 86854ffbc5 Merged master 2013-03-12 21:53:34 -07:00
Solomon Hykes 070bc0bb6d Merged version option by @kencochrane 2013-03-12 20:59:47 -07:00
Ken Cochrane e20a74d247 fixed formatting issue 2013-03-12 17:34:15 -07:00
Solomon Hykes d2cba75d5f Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth 2013-03-12 15:05:41 -07:00
Solomon Hykes f0ef0e393b Merge pull request #58 from lopter/master
Automatically remove the rcfile generated by docker -i from /tmp
2013-03-12 12:15:34 -07:00
Louis Opter b2de17bf2c Automatically remove the rcfile generated by docker -i from /tmp 2013-03-12 12:12:40 -07:00
Solomon Hykes 71e1afcc56 Merge pull request #57 from kencochrane/vagrant-fix
upgraded kernel to 3.5.0-25 to fix a kernel bug
2013-03-12 12:10:17 -07:00
Ken Cochrane 94baf2c5b9 upgraded kernel to 3.5.0-25 to fix a kernel bug 2013-03-12 12:05:04 -07:00
Solomon Hykes 46dce5918a Merge pull request #48 from dotcloud/memorylimits
Memorylimits
2013-03-12 12:02:49 -07:00
creack 453d49573c Put back the github.com path for the import 2013-03-12 11:59:27 -07:00
Solomon Hykes 2d32dca9e7 Merge remote-tracking branch 'remotes/chooper/help-ux' 2013-03-12 11:11:33 -07:00
Solomon Hykes 47c86e7fd9 Merge pull request #53 from jpetazzo/cloudinit
Rework install.sh to work with cloud-init
2013-03-12 10:31:01 -07:00
Solomon Hykes 6193f8b4d4 Merge pull request #43 from kencochrane/vagrant-fix
Vagrant fix
2013-03-12 10:30:08 -07:00
creack d91d0da453 Fix merge issue 2013-03-12 08:59:32 -07:00
creack 150a4fe7e5 Merge master within fs 2013-03-12 08:33:21 -07:00
creack 6908628b55 Add *.orig to .gitignore 2013-03-12 08:06:22 -07:00
Guillaume J. Charmes d24ce7dfd1 Merge branch 'fs' of https://github.com/dotcloud/docker into fs 2013-03-12 05:37:07 -07:00
shin- de50c9c4e8 'docker run' works with paths as well as image IDs 2013-03-12 05:57:19 -07:00
Guillaume J. Charmes 45a8bba15e gofmt 2013-03-12 05:36:37 -07:00
Guillaume J. Charmes f2dc079c05 Add TestCommitRun unit test 2013-03-12 05:35:47 -07:00
Guillaume J. Charmes 2664668388 Add parent when needed on store.Create, fix the mountpoint on store.layer. 2013-03-12 05:23:13 -07:00
Guillaume J. Charmes 18f4e7e196 Put back the relative paths for dev purpose 2013-03-12 05:17:51 -07:00
shin- 8158616d61 Merge branch 'fs' of github.com:dotcloud/docker into fs 2013-03-12 04:29:06 -07:00
shin- 63dd8f1018 Re-enabled cat, write and ls ; Added creation date to image metadata 2013-03-12 04:24:26 -07:00
Guillaume J. Charmes e0b09d4933 Add "nuke" function to docker tests to avoid disk space waste 2013-03-12 00:08:41 -07:00
Jérôme Petazzoni b728c1a81f Add script upload instructions 2013-03-11 23:40:21 -07:00
Jérôme Petazzoni f90f6a0b92 Get rid of bashism 2013-03-11 23:38:11 -07:00
Jérôme Petazzoni c1fa4efad6 Try to load, or install, AUFS modules
When running precise or quantal, installing the matching -extra kernel
will install the required file.
2013-03-11 23:20:28 -07:00
Jérôme Petazzoni fda456b82e Use "start" instead of "restart"
Because when the job isn't running, "restart" won't work.
2013-03-11 23:08:21 -07:00
Jérôme Petazzoni af2aac8736 Stream and unpack the tarball on the fly
We don't need temporary files.
Also, get the tarball from get.docker.io instead of Dropbox.
2013-03-11 23:07:16 -07:00
jpetazzo 53e2e8209f Add missing shebang
cloud-init expects a shebang in the beginning of the script
2013-03-11 22:41:21 -07:00
Solomon Hykes 132ecb2482 Replaced 'pull' and 'put' with 'import' 2013-03-11 21:04:16 -07:00
Sam Alba f8fee42181 Missed a rename 2013-03-11 19:55:14 -07:00
Sam Alba 3684b67572 Added -m to the run command in order to set a memory limit to a container 2013-03-11 19:51:24 -07:00
Sam Alba 948961831a Renamed Container property Ram to Memory before it is too late 2013-03-11 19:25:02 -07:00
Sam Alba 4e5ae88372 Implemented unit tests for the generated LXC config 2013-03-11 19:15:29 -07:00
Ken Cochrane d4da0a0ddb 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 2013-03-11 17:48:39 -07:00
Ken Cochrane 43875a73a0 added a fix to the upstart command that wasn't setting hte LOCALE correctly, which was causing issues with UTF-8 bundles 2013-03-11 17:47:28 -07:00
Sam Alba 75d04a5a75 Added support for RamSwap in the generated LXC config (to limit the swap and have the right default settings) 2013-03-11 17:40:54 -07:00
Solomon Hykes 2548722dae Fix a bug which caused dockerd to crash at startup if a container didn't have a registered mountpoint 2013-03-11 17:05:01 -07:00