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
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
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
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
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
5aae786a89
Setup a predictable, repeatable environment for containers
...
Upstream-commit: fb350e0c7705850cc78e1dc1dc63b56aca06c3cc
Component: engine
2013-03-07 09:25:41 -08:00
4ec7273fca
Container logs are persisted on disk
...
Upstream-commit: 2df0bc6bc0df53c7657404a92fb8f256b7109de0
Component: engine
2013-03-06 16:08:44 -08:00
4f3545b3a6
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 007c57deba0d2ceb1fe6bcf90fd7621e79855651
Component: engine
2013-03-06 00:39:35 -08:00
35ee9964bb
docker port: lookup public-facing tcp ports for a container
...
Upstream-commit: 410ebe379dbf60d8fd75ba695e4e8036fdba6b65
Component: engine
2013-03-06 00:39:03 -08:00
9e8c334ba7
Remove leftover debug message
...
Upstream-commit: 791592731eccfae0072b20a80d15ec31e34dc88f
Component: engine
2013-03-06 00:37:00 -08:00
664b07c397
Moved Vagrant guide to the wiki
...
Trying to keep the authoritative docs very small, so we can keep it correct and up-to-date.
Upstream-commit: 836e7b2881b9257ecb31fc3bbd696af84e17730d
Component: engine
2013-03-05 22:44:09 -08:00
c114400a94
docker rmi -r: remove all images matching a regexp
...
Upstream-commit: 74c88fdbc0180c276f75322066e7da2e3cd38f6d
Component: engine
2013-03-05 22:39:43 -08:00
fe79db830e
Reorganized README
...
Moved Install instructions closer to the top.
Upstream-commit: 711e29fb9b56e9583f9a2730d4d5db21e9cd2105
Component: engine
2013-03-05 16:00:17 -08:00
9cfa2c197b
Updated README: networking no longer "coming soon"
...
Upstream-commit: 9f3b1a8ee05852fe41ddfba2b4765656d3e54805
Component: engine
2013-03-05 15:58:27 -08:00
ee6308efa8
Updated install instructions and download links
...
- New binary download links
- Fixed incorrect install instructions
- Merged client and host install instructions
Upstream-commit: d372dacbc9f4caf9743fe6c67c84c1e273faa663
Component: engine
2013-03-01 17:21:26 -08:00
b8e54f45cd
Re-enabled CmdPull progress bar code which had been temporarily disabled
...
Upstream-commit: 5675439b9100b40529b8eb87447231a2f5a01ad2
Component: engine
2013-02-28 16:30:31 -08:00
ba5971c0a7
Re-enabled lxc capabilities drop
...
Upstream-commit: 2192d3371ceb7431a6dacd170ddadd4ef26d5783
Component: engine
2013-02-28 11:57:57 -08:00
7bb4e569d5
Merge branch 'master' into networking
...
Upstream-commit: f62344b75053fbfaf66246c2cb3e20577e317ce4
Component: engine
2013-02-28 11:52:52 -08:00
db9b80be91
Server: -p option to export TCP ports
...
Upstream-commit: f857fa0dddbf48b959b0876582027ebc46dc5e9e
Component: engine
2013-02-28 11:52:22 -08:00
524643db0f
Docker: Network manager integration
...
Upstream-commit: bd2f51290f4c34daec08474c0bd78952030be6ff
Component: engine
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
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
2013-02-28 11:50:02 -08:00
58a8b7bd53
Update puppet/modules/docker/manifests/init.pp
...
Add required bsdtar dependency
Upstream-commit: ed85cb6508854f6d12d43e8a88a8c728bc633c3c
Component: engine
2013-02-26 18:17:51 -08:00
a736616ad1
Merge from master
...
Upstream-commit: c7f4602b184ec2cab594dfeaf73bed09aa39a749
Component: engine
2013-02-26 17:32:07 -08:00
b9049f5277
Changed .gitignore to not match docker/*.go
...
Upstream-commit: 278aa5f045ad6dd8718933b4736c29567a17717a
Component: engine
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
2013-02-26 17:28:24 -08:00
d2bed9b75c
go fmt
...
Upstream-commit: aa12da6f5076738955b30470639d439a0cbe40f9
Component: engine
2013-02-26 17:26:46 -08:00
9ff14257ee
Updated pybuilder example to use 'docker wait'
...
Upstream-commit: 4004e86fa9ca87332c8f5fa0acbe29af86e06908
Component: engine
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
2013-02-26 11:43:54 -08:00
4ea244cb65
Merge branch 'master' into networking
...
Upstream-commit: 3c0a59f03873e5c062ef0d39267341dd5f5e6bca
Component: engine
2013-02-26 11:04:28 -08:00
c483fcc71c
Merge branch 'master' into networking
...
Upstream-commit: 2c2db5cd45f3281954211dc72a4412f5b611ad24
Component: engine
2013-02-26 11:03:11 -08:00
