fa69063302
updated Vagrant to support new single binary, and exposing the vagrant shared folder, and setting some ENV variables
...
Upstream-commit: d479efc01ead3da7b57c85a493f957e46c5fa0d1
Component: engine
2013-03-13 13:30:13 -07:00
905dafaf18
README: removed superfluous install step
...
Upstream-commit: 895e145e615b407aa485189a8021fd8640700163
Component: engine
2013-03-13 11:28:52 -07:00
8bc8fc57bc
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 41e0c74fd08afb5007320b60b9fe94958dc16155
Component: engine
2013-03-13 11:27:23 -07:00
22fe870560
Moved download binaries to get.docker.io
...
Upstream-commit: d54ff35f022e5e11c5ca124237a1888c4a6161b9
Component: engine
2013-03-13 11:27:06 -07:00
06c0237124
Re-enabled docker rmi
...
Upstream-commit: c3622a963d326df8da8049302e0f2ea4875fc496
Component: engine
2013-03-13 11:14:37 -07:00
906eecfc45
Merged version option by @kencochrane
...
Upstream-commit: 070bc0bb6d316a2a023161a19cba667831a26698
Component: engine
2013-03-12 20:59:47 -07:00
9a8e1b4a6b
fixed formatting issue
...
Upstream-commit: e20a74d2477ea3feb7a9734c15b645d081dbebdf
Component: engine
2013-03-12 17:34:15 -07:00
6d294cf990
Merge pull request #58 from lopter/master
...
Automatically remove the rcfile generated by docker -i from /tmp
Upstream-commit: f0ef0e393bd24cfe9de7cd08aacd7cda45703e6a
Component: engine
2013-03-12 12:15:34 -07:00
ec87b553c7
Automatically remove the rcfile generated by docker -i from /tmp
...
Upstream-commit: b2de17bf2cfdf90f347109452bcb8763138cff46
Component: engine
2013-03-12 12:12:40 -07:00
b085b8597c
Merge pull request #57 from kencochrane/vagrant-fix
...
upgraded kernel to 3.5.0-25 to fix a kernel bug
Upstream-commit: 71e1afcc563cd064e9776372c63f30239a34fc9e
Component: engine
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
2013-03-12 12:05:04 -07:00
0e7bc1161e
Merge pull request #48 from dotcloud/memorylimits
...
Memorylimits
Upstream-commit: 46dce5918aad5134305d6f1eb6357c822a59bbed
Component: engine
2013-03-12 12:02:49 -07:00
35529bba2c
Put back the github.com path for the import
...
Upstream-commit: 453d49573c91a1c49ffbc54d040145804e38d91e
Component: engine
2013-03-12 11:59:27 -07:00
7bcb8dcb89
Merge remote-tracking branch 'remotes/chooper/help-ux'
...
Upstream-commit: 2d32dca9e7616fdd007caf953f70a96a140237a4
Component: engine
2013-03-12 11:11:33 -07:00
1957f767a1
Merge pull request #53 from jpetazzo/cloudinit
...
Rework install.sh to work with cloud-init
Upstream-commit: 47c86e7fd9874ece1fbd109168901c78cb6602cf
Component: engine
2013-03-12 10:31:01 -07:00
a130f465ad
Fix merge issue
...
Upstream-commit: d91d0da45310a4ab8d6124b70a1f541352149bdc
Component: engine
2013-03-12 08:59:32 -07:00
d6cad8aba4
Merge master within fs
...
Upstream-commit: 150a4fe7e5aaa5d733130e22eac09cb36ffadd82
Component: engine
2013-03-12 08:33:21 -07:00
8990ed16c8
Add *.orig to .gitignore
...
Upstream-commit: 6908628b555a1583f079f04ed34f5d81ce917459
Component: engine
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
2013-03-12 05:37:07 -07:00
422044f5c5
'docker run' works with paths as well as image IDs
...
Upstream-commit: de50c9c4e8d0276890cfb521e5b57da58cf470aa
Component: engine
2013-03-12 05:57:19 -07:00
22687838eb
gofmt
...
Upstream-commit: 45a8bba15e95b789c12a371036aa1ad42357dc08
Component: engine
2013-03-12 05:36:37 -07:00
090804e18e
Add TestCommitRun unit test
...
Upstream-commit: f2dc079c05c073d63b10a3c2a2bc784d1e94e82c
Component: engine
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
2013-03-12 05:23:13 -07:00
b9140244d5
Put back the relative paths for dev purpose
...
Upstream-commit: 18f4e7e196eb894765094c1291e1a1f6599f4266
Component: engine
2013-03-12 05:17:51 -07:00
82c8224ed4
Merge branch 'fs' of github.com:dotcloud/docker into fs
...
Upstream-commit: 8158616d6133bbe71ad33b4a2be06664e038b8d0
Component: engine
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
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
2013-03-12 00:08:41 -07:00
26e8bc9499
Add script upload instructions
...
Upstream-commit: b728c1a81fbb441442d635788e814d47436c613f
Component: engine
2013-03-11 23:40:21 -07:00
a66dcb2cd8
Get rid of bashism
...
Upstream-commit: f90f6a0b9248489c43188ca79b9e0dfc306fd8dc
Component: engine
2013-03-11 23:38:11 -07:00
5959f3618b
Try to load, or install, AUFS modules
...
When running precise or quantal, installing the matching -extra kernel
will install the required file.
Upstream-commit: c1fa4efad66a1ae8cbccd7c55bc195be03d94b2f
Component: engine
2013-03-11 23:20:28 -07:00
dae5183be0
Use "start" instead of "restart"
...
Because when the job isn't running, "restart" won't work.
Upstream-commit: fda456b82e51224fe4e7ae6c0bc2b0f0812729ac
Component: engine
2013-03-11 23:08:21 -07:00
b0e2cf6a60
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.
Upstream-commit: af2aac8736d71fe79492f9abf3a16fba97857eb4
Component: engine
2013-03-11 23:07:16 -07:00
d195c6fc42
Add missing shebang
...
cloud-init expects a shebang in the beginning of the script
Upstream-commit: 53e2e8209fd882a3b4f073ce30dec444cc9c7cc0
Component: engine
2013-03-11 22:41:21 -07:00
c1226e5612
Replaced 'pull' and 'put' with 'import'
...
Upstream-commit: 132ecb24822072c82718d47ac23da62a8ea774fc
Component: engine
2013-03-11 21:04:16 -07:00
57b34e832a
Missed a rename
...
Upstream-commit: f8fee421819e3c272e1c20890da7c90b4da971ad
Component: engine
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
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
2013-03-11 19:25:02 -07:00
ac42ba1efc
Implemented unit tests for the generated LXC config
...
Upstream-commit: 4e5ae883722ad814ef19e3f9d333f6218db752a5
Component: engine
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
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
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
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
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
2013-03-11 23:11:46 +00:00
3fc19b598b
Complete fix for #38 -- fix double-usage on help
...
Upstream-commit: a7cb3cb86a39f950a517b61e3a674e0cd080804f
Component: engine
2013-03-11 22:29:13 +00:00
dd314eeb8b
Fix CmdInspect and CmdImages help/parsing. Fixes #38
...
Upstream-commit: 06d420d2ead65cb5af760d7946d8844f568f4d65
Component: engine
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
2013-03-11 14:30:27 -07:00
3720d832c1
post-merge repairs
...
Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6
Component: engine
2013-03-11 07:39:06 -07:00
7c2c4d6c33
Merged upstream changes in fs branch
...
Upstream-commit: 2441edf1a39ad75708292bcc2726184b16fb89b2
Component: engine
2013-03-11 05:50:09 -07:00
347532ed43
Merged master branch into fs
...
Upstream-commit: 97a8209438dcc60395b244c14f4efced583eb364
Component: engine
2013-03-11 05:42:36 -07:00
c28aedcbf3
Change relative paths to absolute
...
Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d
Component: engine
2013-03-11 02:59:52 -07:00
