Commit Graph
536 Commits
Author SHA1 Message Date
Ken Cochrane 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
Ken Cochrane 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
Sam Alba 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
Solomon Hykes 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
Charles Hooper 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
Charles Hooper 3fc19b598b Complete fix for #38 -- fix double-usage on help
Upstream-commit: a7cb3cb86a39f950a517b61e3a674e0cd080804f
Component: engine
2013-03-11 22:29:13 +00:00
Charles Hooper dd314eeb8b Fix CmdInspect and CmdImages help/parsing. Fixes #38
Upstream-commit: 06d420d2ead65cb5af760d7946d8844f568f4d65
Component: engine
2013-03-11 22:08:22 +00:00
Sam Alba 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
shin- 3720d832c1 post-merge repairs
Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6
Component: engine
2013-03-11 07:39:06 -07:00
shin- 7c2c4d6c33 Merged upstream changes in fs branch
Upstream-commit: 2441edf1a39ad75708292bcc2726184b16fb89b2
Component: engine
2013-03-11 05:50:09 -07:00
shin- 347532ed43 Merged master branch into fs
Upstream-commit: 97a8209438dcc60395b244c14f4efced583eb364
Component: engine
2013-03-11 05:42:36 -07:00
Guillaume J. Charmes c28aedcbf3 Change relative paths to absolute
Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d
Component: engine
2013-03-11 02:59:52 -07:00
Solomon Hykes fae9969603 Removed deprecated docker/image package
Upstream-commit: dd0227b700503e03fce0e9e9ea3539c438e9c0cb
Component: engine
2013-03-09 20:17:31 -08:00
Solomon Hykes 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
2013-03-09 19:56:33 -08:00
Solomon Hykes f836da6c3f Fixed a bug which caused docker to crash at startup while restoring existing containers
Upstream-commit: 4474cd5677751ee5acac0525953eea583f797a1b
Component: engine
2013-03-09 19:49:09 -08:00
Solomon Hykes 279f7946e3 gofmt
Upstream-commit: c59fff422fdc61c1c994b44fd83e4173a2f0530a
Component: engine
2013-03-09 19:44:09 -08:00
shin- 44192a1329 Plugged in image store in front-end (some commands are deactivated right now, will progressively reintroduce them
Upstream-commit: 93ba6dd82bb62dbb9cac729cfa6626c469a87d00
Component: engine
2013-03-08 10:48:22 -08:00
Solomon Hykes 5aae786a89 Setup a predictable, repeatable environment for containers
Upstream-commit: fb350e0c7705850cc78e1dc1dc63b56aca06c3cc
Component: engine
2013-03-07 09:25:41 -08:00
Solomon Hykes 4ec7273fca Container logs are persisted on disk
Upstream-commit: 2df0bc6bc0df53c7657404a92fb8f256b7109de0
Component: engine
2013-03-06 16:08:44 -08:00
Solomon Hykes 4f3545b3a6 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 007c57deba0d2ceb1fe6bcf90fd7621e79855651
Component: engine
2013-03-06 00:39:35 -08:00
Solomon Hykes 35ee9964bb docker port: lookup public-facing tcp ports for a container
Upstream-commit: 410ebe379dbf60d8fd75ba695e4e8036fdba6b65
Component: engine
2013-03-06 00:39:03 -08:00
Solomon Hykes 9e8c334ba7 Remove leftover debug message
Upstream-commit: 791592731eccfae0072b20a80d15ec31e34dc88f
Component: engine
2013-03-06 00:37:00 -08:00
Solomon Hykes 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
Solomon Hykes c114400a94 docker rmi -r: remove all images matching a regexp
Upstream-commit: 74c88fdbc0180c276f75322066e7da2e3cd38f6d
Component: engine
2013-03-05 22:39:43 -08:00
Solomon Hykes fe79db830e Reorganized README
Moved Install instructions closer to the top.
Upstream-commit: 711e29fb9b56e9583f9a2730d4d5db21e9cd2105
Component: engine
2013-03-05 16:00:17 -08:00
Solomon Hykes 9cfa2c197b Updated README: networking no longer "coming soon"
Upstream-commit: 9f3b1a8ee05852fe41ddfba2b4765656d3e54805
Component: engine
2013-03-05 15:58:27 -08:00
Solomon Hykes 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
Solomon Hykes e64fe2c171 Merge pull request #23 from dotcloud/networking
Functional TCP networking: port allocation, inbound DNAT, outbound SNAT, multiple ports.
Upstream-commit: 76b66f73b3404aa5764ee2936033cefa886a0aae
Component: engine
2013-02-28 16:32:55 -08:00
Solomon Hykes 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
Andrea Luzzardi ba5971c0a7 Re-enabled lxc capabilities drop
Upstream-commit: 2192d3371ceb7431a6dacd170ddadd4ef26d5783
Component: engine
2013-02-28 11:57:57 -08:00
Andrea Luzzardi 7bb4e569d5 Merge branch 'master' into networking
Upstream-commit: f62344b75053fbfaf66246c2cb3e20577e317ce4
Component: engine
2013-02-28 11:52:52 -08:00
Andrea Luzzardi db9b80be91 Server: -p option to export TCP ports
Upstream-commit: f857fa0dddbf48b959b0876582027ebc46dc5e9e
Component: engine
2013-02-28 11:52:22 -08:00
Andrea Luzzardi 524643db0f Docker: Network manager integration
Upstream-commit: bd2f51290f4c34daec08474c0bd78952030be6ff
Component: engine
2013-02-28 11:52:07 -08:00
Andrea Luzzardi 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
Andrea Luzzardi 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
Daniel Mizyrycki 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
shin- 9a491da582 Merge branch 'master' into fs
Upstream-commit: ffbb9c8e4a1b7c98bbb602a8428376e4a41214d3
Component: engine
2013-02-26 17:45:55 -08:00
shin- 4c53a7568f Halfway through fs branch fixes, TestUser not passing
Upstream-commit: 2ebf3464a1ed5bf32e33eff45cfa8e8394b5cd43
Component: engine
2013-02-26 17:45:46 -08:00
Andrea Luzzardi a736616ad1 Merge from master
Upstream-commit: c7f4602b184ec2cab594dfeaf73bed09aa39a749
Component: engine
2013-02-26 17:32:07 -08:00
Solomon Hykes b9049f5277 Changed .gitignore to not match docker/*.go
Upstream-commit: 278aa5f045ad6dd8718933b4736c29567a17717a
Component: engine
2013-02-26 17:29:11 -08:00
Solomon Hykes 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
Solomon Hykes d2bed9b75c go fmt
Upstream-commit: aa12da6f5076738955b30470639d439a0cbe40f9
Component: engine
2013-02-26 17:26:46 -08:00
Solomon Hykes 9ff14257ee Updated pybuilder example to use 'docker wait'
Upstream-commit: 4004e86fa9ca87332c8f5fa0acbe29af86e06908
Component: engine
2013-02-26 14:47:20 -08:00
Solomon Hykes 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
Andrea Luzzardi 4ea244cb65 Merge branch 'master' into networking
Upstream-commit: 3c0a59f03873e5c062ef0d39267341dd5f5e6bca
Component: engine
2013-02-26 11:04:28 -08:00
Andrea Luzzardi c483fcc71c Merge branch 'master' into networking
Upstream-commit: 2c2db5cd45f3281954211dc72a4412f5b611ad24
Component: engine
2013-02-26 11:03:11 -08:00
Solomon Hykes c9db276294 New example: pybuilder
Upstream-commit: 8fa07c0e060a25141204533a2a3823d1cb0fdf63
Component: engine
2013-02-26 10:03:06 -08:00
Solomon Hykes 471e62f72d Added tests for checksum computation in layer store
Upstream-commit: 6d1054619d6d254ea3df0484cacb3c6778d58cd9
Component: engine
2013-02-26 09:46:29 -08:00
Andrea Luzzardi 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
2013-02-25 14:06:22 -08:00
Solomon Hykes bf25f46c0f Updated dependencies in install.sh
Upstream-commit: edf2e20e284a6a3bb28e178745d2069d63261235
Component: engine
2013-02-25 12:27:51 -08:00