72e2fd7949
Merge pull request #3759 from jpoimboe/links-iptables-cleanup
...
network: remove unnecessary links iptables rule for return traffic
Upstream-commit: d4ea6308fd0593a50c9f245a8dfd4db8cba8c297
Component: engine
2014-01-28 11:10:36 -08:00
836f4000cf
Merge pull request #3807 from pwaller/fix-unclear-error
...
Fix unclear error message when deleting container
Upstream-commit: 13ee6d8eee49e0f2ed285c5a4c54fb294711bc96
Component: engine
2014-01-28 10:35:09 -08:00
a36f456dfc
Merge pull request #3805 from alexlarsson/execdriver-drop-getexitcode
...
exexdriver: Make Command.GetExitCode an internal call
Upstream-commit: 09ed7e8878a71c92e6f60a72eb61000d768d7e39
Component: engine
2014-01-28 10:34:00 -08:00
494e7dcbd4
exexdriver: Make Command.GetExitCode an internal call
...
This code only works for backends that directly spawn the child
via the Command. It will not work for the libvirt backend. So
we move this code into the individual backends that need it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 9ad70528b723810d98e77368458408e85eebdfee
Component: engine
2014-01-28 19:20:35 +01:00
b941fc82f6
Fix unclear error message when deleting container
...
I was getting the following error:
```
$ bundles/0.7.6-dev/binary/docker-0.7.6-dev run -rm -v=/var/run:/foo base echo hi
hi
2014/01/28 14:24:46 Error: container_delete: No such id: run
```
This commit makes the true origin of the error clearer. Issue #3806 is
tracking the cause of the error.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
Upstream-commit: 70c1781e073287a0b012ce94ea1b233fd6628dfa
Component: engine
2014-01-28 14:28:13 +00:00
ebd052235d
Merge pull request #3789 from pwaller/issue-3674
...
Fix for #3674 Can't `rm` containers when disk full
Upstream-commit: ed12818f99589b2b65a4f2510996f6bc6e828820
Component: engine
2014-01-27 17:00:16 -08:00
683072d4db
Merge pull request #3796 from tianon/dockerfile-btrfs
...
Update Dockerfile to be based on 13.10 instead of 12.04, add linux-libc-dev dep, remove s3cmd backports nonsense
Upstream-commit: eaca205942d861e28957f7c3e1bbf690af8197d4
Component: engine
2014-01-27 16:54:06 -08:00
f6f766084e
Update Dockerfile to be based on 13.10 instead of 12.04 so that we can remove our s3cmd backports need, and so we can have the new linux-libc-dev dependency we need for compiling the btrfs driver without nasty APT hackery
...
In addition, we've now hard-coded LXC version 0.8 compiled from source so that we can have the most stable dev environment possible.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 94566b748e69a57cf88ef4acbe18ecbe76bb2f54
Component: engine
2014-01-27 17:18:33 -07:00
cbd44a7619
Merge pull request #3798 from vieux/3777_fix
...
fix mflag import
Upstream-commit: 1ddd81519170ca197646cbb736349803d3535a1f
Component: engine
2014-01-27 15:31:54 -08:00
a9728be13d
fix mflag import
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: c4e7b0e4d539c66f095d726856562c65f25eac0b
Component: engine
2014-01-27 23:29:56 +00:00
e26aa09e8a
Add Peter Waller <p@pwaller.net> to AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
Upstream-commit: c4c558d138c43c6e2a48fd3060c4b8c81ace989b
Component: engine
2014-01-27 22:21:58 +00:00
570b11b916
Merge pull request #3787 from pwaller/issue-3786
...
Fix for issue #3786 `docker rm` unmounts in the wrong order
Upstream-commit: 77d4df1e0bc42105a1cd6dbe7fb98e26d0027510
Component: engine
2014-01-27 13:41:14 -08:00
e2347e9700
Merge pull request #3784 from 1uptalent/3783_release_push_lock
...
FIX #3783 : Release the push lock after the image push is completed
Upstream-commit: 99dd387fd70e7f786e8a81b5f8c9c62979f3d5a4
Component: engine
2014-01-27 13:40:28 -08:00
46e7da8626
Merge pull request #3790 from crosbymichael/move-port-allocators
...
Move port allocators into network driver
Upstream-commit: f4b75e06bcbee06907ed015c450799b3d30055a6
Component: engine
2014-01-27 13:36:33 -08:00
98d13d7d17
Fix for #3674 Can't rm containers when disk full
...
Rather than creating a new directory and moving it there before
deleting that new directory, just move the directory we intend to
delete.
In the old way, the Mkdirall could fail, which meant that you
couldn't delete containers when the disk was full.
Tested.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
Upstream-commit: 6f3d8d39085e7dc31f757c0221eca7ab5f220224
Component: engine
2014-01-27 21:34:11 +00:00
e7abb13a0f
Merge pull request #3776 from fabiofalci/container_list_test
...
Improve test for container list `ps`
Upstream-commit: 91b11dd15628ef95c4d6d9400edb5533f4588e16
Component: engine
2014-01-27 13:32:23 -08:00
254ce5fef5
Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg
...
move the contributing hook into contrib, and use curl in the same way as the gofmt above
Upstream-commit: bbfc531b51cb17e97022ff0e904f91faac48713f
Component: engine
2014-01-27 12:09:03 -08:00
d680ae54b5
Merge pull request #3781 from mattymo/patch-1
...
Clean up grammar on puppet.rst
Upstream-commit: 093531ddb7f4ee53cd166bfd9316af0c1de7424c
Component: engine
2014-01-27 12:06:43 -08:00
8e2497b678
Merge pull request #3773 from mnaberez/supervisord-apache2-example
...
Use exec to replace bash with apache2 after environment is set up
Upstream-commit: adae0b248d6f6732f15ef96f856ac097d038a181
Component: engine
2014-01-27 12:01:59 -08:00
0e5f62a6b2
Merge pull request #3770 from aaronfeng/fix-image-name-pos
...
move image name into correct position
Upstream-commit: ef37fdd1a853fbef8cbabe1a34c527d278589067
Component: engine
2014-01-27 11:56:36 -08:00
a025501ee9
Merge pull request #3756 from crosbymichael/fix-register-nobridge
...
Refactor and fix register interface when bridge does not exist
Upstream-commit: f9e9637a9f42794ace5833f778705061e50fc4ca
Component: engine
2014-01-27 10:40:42 -08:00
b28de2eada
Fix for issue #3786
...
This is a fix for the case that one mount is inside another mount and
docker can't then delete the resulting container.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
Upstream-commit: 32753c3d241c9238b2a34f61fd44399453d7b455
Component: engine
2014-01-27 17:31:25 +00:00
e2920619d5
Release the push lock at the end
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
Upstream-commit: 77a34920b24901da82f9e22138ef21ffc665d678
Component: engine
2014-01-27 16:22:59 +01:00
b231028354
Update puppet.rst
...
Upstream-commit: 551e1a766c8aaec190972e3542fd8a1c7452b6b2
Component: engine
2014-01-27 18:21:48 +03:00
11aa2d4639
Clean up grammar on puppet.rst
...
Upstream-commit: 03d9984f177ec1d093011bcf3693338dabecc19e
Component: engine
2014-01-27 15:13:17 +03:00
80cd671c19
Improve test for container list ps
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Upstream-commit: 1ee1dc2340ef030fc3ed132ff51d196536b46600
Component: engine
2014-01-26 23:14:50 +00:00
fa1cce6c36
Fix issues from rebase on master
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5e69b3837b26d1d1f7cd8b3c4f5b077ba642bd20
Component: engine
2014-01-26 14:07:43 -08:00
1feadd553a
Simplify logic for registering ports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: da61b99b392657343df4dc221ba5cd9ad6b1c9e1
Component: engine
2014-01-26 14:01:38 -08:00
c14df520ff
Refactor to support multiple ip addresses
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ac2a4e64106b28d7b05d1ee31716af365424ff83
Component: engine
2014-01-26 14:01:38 -08:00
ad36af979f
Remove std sort and use custom sort for performances
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: da30eb7c2038c8c554e1f44c80c061c7a827a429
Component: engine
2014-01-26 14:01:38 -08:00
c104696fd4
Add port allocator and move ipset into orderedintset
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 303ed3c8300183bab09a36b58e0c1db89d12424a
Component: engine
2014-01-26 14:01:38 -08:00
47410e7905
Use exec to replace bash with apache2 after environment is set up
...
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com > (github: mnaberez)
Upstream-commit: 2ba2a8ae40b83ac1cc0c4a60724073fa8255b257
Component: engine
2014-01-26 11:53:22 -08:00
ebab9ce224
Merge pull request #3771 from srt32/patch-1
...
Update README.md typo
Upstream-commit: ffdc2d265713fc64516cffbcf6f2f80609d1cbdf
Component: engine
2014-01-26 09:07:00 -08:00
5d3cc5f71c
move image name into correct position
...
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com > (github: aaronfeng)
Upstream-commit: 31e59580092bd4f144bf512e2fd13dcba426b02a
Component: engine
2014-01-26 08:11:30 -05:00
4d09b5ba08
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Simon Taranto <simon.taranto@gmail.com > (github: srt32)
Upstream-commit: 33ee78004f0f2a3cd760952f724c5ea0a9d24b37
Component: engine
2014-01-26 00:08:55 -07:00
de913bbe65
network: remove unnecessary links iptables rule for return traffic
...
Currently there are two iptables rules per port for each link: one to
allow the parent to connect to the child's port, and another one to
allow return traffic from the child back to the parent. The second rule
shouldn't be needed because the "ctstate RELATED,ESTABLISHED" rule can
already allow all established traffic.
So this patch does the following:
1. Move the RELATED,ESTABLISHED rule to be _before_ the potential
inter-container communication DROP rule so it will work for
inter-container traffic as well. Since we're inserting, everything
is reversed chronologically so it should be inserted _after_ we
insert the DROP. This also has a small performance benefit because
it will be processed earlier and it's generally one of the most
commonly used rules.
2. Get rid of the unnecessary return traffic rule per link.
3. Also move the other "Accept all non-intercontainer outgoing packets"
rule to earlier. This gives a small performance benefit since it's
also a commonly used rule, and it makes sense to logically group it
next to the ctstate rule.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
Upstream-commit: 5c04f1bcc70e81fe3c93b1c246ce17a11304ad7f
Component: engine
2014-01-24 21:20:34 -06:00
75afea3f4d
Update tests to have custom routes
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: b1d26985d0dfcbecc8264124fa81ff843a6d574b
Component: engine
2014-01-24 17:18:48 -08:00
4020a7cd25
Merge branch 'fix-register-nobridge' of https://github.com/crosbymichael/docker into crosbymichael-fix-register-nobridge
...
Upstream-commit: eedaf08eb8dc7a9a6265cc3d9bd62f614e89a411
Component: engine
2014-01-24 17:02:19 -08:00
2a36ccea3e
Merge pull request #3757 from vieux/auth_job
...
move auth to a job
Upstream-commit: e6ae8f6d21f8d3a140e4c96a4fbe6786fe866ea9
Component: engine
2014-01-24 16:54:48 -08:00
70553c6361
move auth to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 1f8b1bb84e65cfd84f938eb01e1a48c33fce5a27
Component: engine
2014-01-24 16:51:02 -08:00
2b910ab2c2
Merge pull request #3728 from vieux/container_job
...
Move containers to a job
Upstream-commit: e2003fea3a5ddf560cc4b9677045e459c196dd53
Component: engine
2014-01-24 16:10:46 -08:00
b7a9dba025
Move containers to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5ea2986ce5cfce1b86fdc92610dbc6d670691168
Component: engine
2014-01-24 16:07:42 -08:00
6844d7aab2
Merge pull request #3727 from vieux/push_job
...
push job
Upstream-commit: 748a009cc41ca682377dc55ed287ed9c8bfd164c
Component: engine
2014-01-24 15:42:22 -08:00
29cb397f3d
push job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e8ee18fa2993bd47069ba582889b0c83a68f3d43
Component: engine
2014-01-24 15:34:08 -08:00
ffeff9b5a1
Merge pull request #3739 from vieux/events_jobs
...
move events to job
Upstream-commit: 4a708f9f5b394f7e669de49b80f832ceda5b6876
Component: engine
2014-01-24 15:32:25 -08:00
043779a4ab
move events to job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5cc6312bfc4e511784693d02b9bb8e8d9d1c04b0
Component: engine
2014-01-24 15:28:17 -08:00
e4d813640e
Merge pull request #3621 from vieux/inspect_job
...
Inspect job
Upstream-commit: 59df776469eed793556d3668465e604870219985
Component: engine
2014-01-24 15:22:20 -08:00
650f0e4bf5
merge 2 jobs, no more buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5fd8aa02bae6602bfe6bff541be1e1dc5c1e0fb8
Component: engine
2014-01-24 15:13:30 -08:00
f3fc21caa0
update attach to use the new job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a7e9baaf89ae86dba4f93fb76a436e4c86249e4c
Component: engine
2014-01-24 15:11:38 -08:00
760e8be989
move inspect to 2 jobs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 134435a79c06bd178aa6f687fcabeb2caced485a
Component: engine
2014-01-24 15:11:38 -08:00
Guillaume J. Charmes
Michael Crosby
Alexander Larsson
Peter Waller
Tianon Gravi
Victor Vieux
Andy Rothfusz
Abel Muiño
mattymo
Fabio Falci
Guillaume J. Charmes
Mike Naberezny
James Turnbull
Aaron Feng
Simon Taranto
Josh Poimboeuf