Commit Graph

39 Commits

Author SHA1 Message Date
6c91c91066 More informative error message on name collisions
This is the proposed fix for #2506. It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.

I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b
Component: engine
2013-11-18 17:51:47 +00:00
b2bdca3ec2 Merge pull request #2712 from makinacorpus/master
Do not drop sys_boot
Upstream-commit: ad96d5ff04dd9b8284bad4f86ed285f905723951
Component: engine
2013-11-15 10:33:41 -08:00
b60d444c4f Merge pull request #2527 from jpoimboe/fedora-iptables-fix
Fix container networking on Fedora
Upstream-commit: d589cc36227702e40038704ab048efff23bc71d9
Component: engine
2013-11-11 15:12:40 -08:00
d772cfe673 make all image ID and container ID API responses use the Long ID (Closes #2098)
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
2013-11-09 12:16:49 +10:00
07f796bd96 network: add iptables rules to explicitly allow forwarding
Explicitly enable container networking for Fedora and other distros that
have a REJECT all rule at the end of their FORWARD table.
Upstream-commit: ec4657b28a3e97447921357d454df974e0979ac6
Component: engine
2013-11-07 16:23:39 -06:00
9fe5aeedd4 Merge pull request #2517 from gurjeet/patch-2
Add gurjeet  as an author
Upstream-commit: 7f7926525ac1aa1bd470121dbba22588f95e789e
Component: engine
2013-11-05 10:52:54 -08:00
00be4ae87e Merge pull request #2533 from jamtur01/add_sudo
Some format and syntax changes.
Upstream-commit: dc333878d2337684466f0241d19bccf3a4fad4b5
Component: engine
2013-11-04 11:24:51 -08:00
164d9c3b6b Create new network on dead ghosts on restart.
Fixes #2089
Upstream-commit: 95708dd35cd94a2c849e37efa05bb4e01ed36bb8
Component: engine
2013-11-03 14:13:18 -05:00
beba024082 Some format and syntax changes.
* Added sudo as per convention to docker commands
* Break the Dockerfile block up
* Redis is a proper noun
* Minor whitespace fixes
Upstream-commit: c33d26a8da0dc2dd33918bc5e21283dd62f6d755
Component: engine
2013-11-02 17:53:44 -07:00
947a350ef3 Add myself as an author 7e09c633
One of my patches was incorporated into Docker, and at that time I didn't know that I was supposed to add myself into this list of contributors.

Commit ID: 7e09c6332de11538e170b4d25ccd5bfa068ffd1e

And a few other patches are already in the pipeline.
Upstream-commit: 9ebac49be00ad140f7a8ef156b9ae7850dd8c273
Component: engine
2013-11-01 12:31:50 -05:00
39bb284f54 Expose IP, port, proto as sep. env vars when linking, Closes #2430
Upstream-commit: 1de23f1b81956bc04ba047d066ff7d84d9162910
Component: engine
2013-10-28 23:02:28 -07:00
78b1cb1fcb Do not drop sys_boot
This fixes #2391
Upstream-commit: b64ce8e33cb0a63ede881da78580e37ea4f0d6a7
Component: engine
2013-10-25 18:41:03 +02:00
9c63bb13cc check return value of syscall.Chdir when changing working directory
Upstream-commit: 1043055b10443c3b8d6b7c67c3e858a6b3ca9e00
Component: engine
2013-10-14 15:27:38 +08:00
b2ba4dc1a1 Initial steps to fix Issue #936
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05:00
4af9c06750 Update AUTHORS
Upstream-commit: dabac81824f8ab9ec0bd80f1fcaa026aa103b1e3
Component: engine
2013-10-08 23:51:38 -04:00
c0f4a2ef7d add Brian Olsen to AUTHORS
Upstream-commit: b7826f56664c85e44207ce5e1e685ed04016feb6
Component: engine
2013-09-10 16:55:27 +00:00
a719a21e63 add Martin Redmond to AUTHORS
Upstream-commit: dd806b4ecd2c94356342da720e580ab13288df33
Component: engine
2013-09-09 22:19:28 +00:00
a2a878343d Add 2 missing cli commands to docs (events + insert) and alphabetically order docker output
Upstream-commit: 6380b42edbf98dec3b04b3b74fcfbfd63dba4034
Component: engine
2013-09-03 16:35:22 +02:00
d067439363 Added Emily Rose to AUTHORS.
Upstream-commit: 18d572abb4b633d766c9a28119a118761103f5f8
Component: engine
2013-08-28 22:28:31 -07:00
871898eda4 Merge pull request #1483 from titanous/update-authors
Update AUTHORS
Upstream-commit: 940d58806c3e3d4409a7eee4859335e98139d09f
Component: engine
2013-08-10 21:16:34 -07:00
99c7db4cc9 Update AUTHORS
Upstream-commit: 1408f08c40f73ccf0204334ceb44ac482c5641e9
Component: engine
2013-08-09 20:09:42 -04:00
335d59ebfb Add myself to AUTHORS
Upstream-commit: 722d4e916a727716f7f7b330c8fbea4bc089d62f
Component: engine
2013-08-09 14:39:03 -07:00
8dc1c40e57 Add Colin Rice to AUTHORS file
Upstream-commit: ccffa6976616ddf5fc8c83f84d17e53ca8e0bca9
Component: engine
2013-08-07 18:28:39 -04:00
915bf69673 Merge branch 'cleanup_signal_handling' of https://github.com/calavera/docker into calavera-cleanup_signal_handling
Upstream-commit: c99e8de5a4faeb6c3d696790cc300a88f8e96855
Component: engine
2013-07-30 11:14:36 +00:00
cd3a1b4855 Update AUTHORS
Upstream-commit: 5eb590e79d081ecfa82ba940ea856c4a2c0411ca
Component: engine
2013-07-26 15:48:01 -04:00
f64e80d22b update AUTHORS
Upstream-commit: 7aba68cd548d69e10e710029ca143b32fd291585
Component: engine
2013-07-23 19:55:38 +00:00
d9bf1bf281 Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param
Upstream-commit: 862e223cecec203a96d3be4fd667bc9286703e82
Component: engine
2013-06-25 13:33:45 +00:00
d12d87ce31 Update AUTHORS
Upstream-commit: b0b690cf23871d36e1f981fcee6cb929158c4fee
Component: engine
2013-06-20 23:29:20 -04:00
3c8ee31f8a fix docker version git output
Upstream-commit: b25bcf1a666ebef26e2acfa132fa2b72d47d0805
Component: engine
2013-06-17 23:32:48 +00:00
2bb72522f6 add Michael Crosby to AUTHORS
Upstream-commit: 3ea6a2c7c39695fbfe3dfe228db00335c9937c14
Component: engine
2013-06-11 10:17:39 +00:00
e420edad89 Add Daniel Gasienica to AUTHORS
Upstream-commit: 766a2db0d94d0f7cd8bdb71762476893a4df4cc1
Component: engine
2013-05-31 12:19:57 -07:00
52887551f6 Documented who decides what and how.
Upstream-commit: 24ddfe3f25f99db5a23f62d411c949b2236288a1
Component: engine
2013-05-28 19:39:09 -07:00
3d72be8236 Update AUTHORS
Upstream-commit: 3a339b2bb3b06a110ccf93146cf020279705df84
Component: engine
2013-05-15 15:57:21 -04:00
9b95a8b869 Update AUTHORS
Upstream-commit: 343ed6b53f225e35bb5464efb556f555a31056a1
Component: engine
2013-04-12 10:44:50 -04:00
908cac785f Fix broken link in doc site.
Broken link was from python_web_app to nonexistent "base commands page"; updated to point to next item in examples menu, running_ssh_service screencast.
Upstream-commit: 92186d7cf71acbf4027e390b33590570cf4ff290
Component: engine
2013-04-03 22:23:17 -07:00
8a40ce58f3 Make IP allocator lazy
Instead of allocating all possible IPs in advance, generate them as
needed.

A loop will cycle through all possible IPs in sequential order,
allocating them as needed and marking them as in use. Once the loop
exhausts all IPs, it will wrap back to the beginning. IPs that are
already in use will be skipped. When an IP is released, it will be
cleared and be available for allocation again.

Two decisions went into this design:

1) Minimize memory footprint by only allocating IPs that are actually
in use

2) Minimize reuse of released IP addresses to avoid sending traffic to
the wrong containers

As a side effect, the functions for IP/Mask<->int conversion have been
rewritten to never be able to fail in order to reduce the amount of
error returns.

Fixes gh-231
Upstream-commit: 6f9a67a7c7cb717ad1a575df3e4c0fd2ec8bc651
Component: engine
2013-04-01 06:02:44 +02:00
c6d2fd3579 Update AUTHORS and add .mailmap
Upstream-commit: 6bcc55f7d030d0cfd7bf130070805a9001951b06
Component: engine
2013-03-28 20:53:54 -04:00
09362ffb5b incorporate feedback from https://github.com/dotcloud/docker/issues/42
Upstream-commit: e53f45f621df0e8004fe3aa482a948eb32b709b6
Component: engine
2013-03-26 09:17:44 -04:00
05d88d3305 packaging; issue #30: Add ubuntu deb packaging
Upstream-commit: 09d96656a05e7fe7f1056c23e9b9973f8972810a
Component: engine
2013-03-13 17:08:04 -07:00