Commit Graph
216 Commits
Author SHA1 Message Date
Solomon Hykes 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
Solomon Hykes b907ad129d Merge pull request #43 from kencochrane/vagrant-fix
Vagrant fix
Upstream-commit: 6193f8b4d429d7363a45f1700961c02a284516bd
Component: engine
2013-03-12 10:30:08 -07:00
Jérôme Petazzoni 26e8bc9499 Add script upload instructions
Upstream-commit: b728c1a81fbb441442d635788e814d47436c613f
Component: engine
2013-03-11 23:40:21 -07:00
Jérôme Petazzoni a66dcb2cd8 Get rid of bashism
Upstream-commit: f90f6a0b9248489c43188ca79b9e0dfc306fd8dc
Component: engine
2013-03-11 23:38:11 -07:00
Jérôme Petazzoni 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
Jérôme Petazzoni 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
Jérôme Petazzoni 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
jpetazzo 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
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
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
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
Solomon Hykes f0b398797f Moved Jeff's install script to the repo
Upstream-commit: 2c7a2cbaf4f3b47786eee3726de61b67182a8d44
Component: engine
2013-02-25 12:27:29 -08:00
Andrea Luzzardi 550e796b18 Network allocator
Upstream-commit: 797bb6e75b8f33fe44932bf90145cf069f342e44
Component: engine
2013-02-25 10:45:23 -08:00
Solomon Hykes 4d44fcf0c5 Merge pull request #19 from brianm/master
Ignore .vagrant directory
Upstream-commit: deb74ef674b332ade9e384985fb3a57a4d93577b
Component: engine
2013-02-23 13:11:39 -08:00
Brian McCallister 1b8770e955 ignore .vagrant
Upstream-commit: ac15003c05a844aa08e591ff7675ff6a406f188b
Component: engine
2013-02-23 13:59:06 -07:00
Solomon Hykes 0b5203d2cd 'docker pull' and 'docker put' automatically detect tar compression (gzip, bzip2 or uncompressed). -j and -z flags are no longer required.
Upstream-commit: f437f5b8b4a706d56f9a7cfba1dbc6b21e9a33f3
Component: engine
2013-02-22 12:28:25 -08:00
Andrea Luzzardi 5d44a89654 Network tests
Upstream-commit: 149badc22b45acb171c3e583f6e820a06e4ced87
Component: engine
2013-02-21 18:34:35 -08:00
Andrea Luzzardi 98683195b2 Network: Do not assume that we are using a class C. Instead, compute the
IP addresses range and network size in order to allocate an IP address.
Upstream-commit: e0e49b9a2259d779b31055339e67b054c8dffc3b
Component: engine
2013-02-21 18:33:23 -08:00
Solomon Hykes 4979c2522b Updated install instructions and requirements
Upstream-commit: dd96b6fccbe539f78c6957bacbbfaa3f048fdea1
Component: engine
2013-02-21 16:33:58 -08:00
Andrea Luzzardi a99e747427 Network: Simple random IP allocation on the bridge network.
Upstream-commit: 6124c5eb31ab8f9db4db288002388554d6181c86
Component: engine
2013-02-21 10:47:57 -08:00