91b11dd156
Merge pull request #3776 from fabiofalci/container_list_test
...
Improve test for container list `ps`
2014-01-27 13:32:23 -08:00
bbfc531b51
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
2014-01-27 12:09:03 -08:00
093531ddb7
Merge pull request #3781 from mattymo/patch-1
...
Clean up grammar on puppet.rst
2014-01-27 12:06:43 -08:00
adae0b248d
Merge pull request #3773 from mnaberez/supervisord-apache2-example
...
Use exec to replace bash with apache2 after environment is set up
2014-01-27 12:01:59 -08:00
ef37fdd1a8
Merge pull request #3770 from aaronfeng/fix-image-name-pos
...
move image name into correct position
2014-01-27 11:56:36 -08:00
f9e9637a9f
Merge pull request #3756 from crosbymichael/fix-register-nobridge
...
Refactor and fix register interface when bridge does not exist
2014-01-27 10:40:42 -08:00
32753c3d24
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)
2014-01-27 17:31:25 +00:00
77a34920b2
Release the push lock at the end
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
2014-01-27 16:22:59 +01:00
551e1a766c
Update puppet.rst
2014-01-27 18:21:48 +03:00
03d9984f17
Clean up grammar on puppet.rst
2014-01-27 15:13:17 +03:00
1ee1dc2340
Improve test for container list `ps`
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
2014-01-26 23:14:50 +00:00
5e69b3837b
Fix issues from rebase on master
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-26 14:07:43 -08:00
da61b99b39
Simplify logic for registering ports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-26 14:01:38 -08:00
ac2a4e6410
Refactor to support multiple ip addresses
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-26 14:01:38 -08:00
da30eb7c20
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)
2014-01-26 14:01:38 -08:00
303ed3c830
Add port allocator and move ipset into orderedintset
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-26 14:01:38 -08:00
2ba2a8ae40
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)
2014-01-26 11:53:22 -08:00
ffdc2d2657
Merge pull request #3771 from srt32/patch-1
...
Update README.md typo
2014-01-26 09:07:00 -08:00
31e5958009
move image name into correct position
...
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-01-26 08:11:30 -05:00
33ee78004f
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Simon Taranto <simon.taranto@gmail.com> (github: srt32)
2014-01-26 00:08:55 -07:00
5c04f1bcc7
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)
2014-01-24 21:20:34 -06:00
b1d26985d0
Update tests to have custom routes
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-01-24 17:18:48 -08:00
eedaf08eb8
Merge branch 'fix-register-nobridge' of https://github.com/crosbymichael/docker into crosbymichael-fix-register-nobridge
2014-01-24 17:02:19 -08:00
e6ae8f6d21
Merge pull request #3757 from vieux/auth_job
...
move auth to a job
2014-01-24 16:54:48 -08:00
1f8b1bb84e
move auth to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 16:51:02 -08:00
e2003fea3a
Merge pull request #3728 from vieux/container_job
...
Move containers to a job
2014-01-24 16:10:46 -08:00
5ea2986ce5
Move containers to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 16:07:42 -08:00
748a009cc4
Merge pull request #3727 from vieux/push_job
...
push job
2014-01-24 15:42:22 -08:00
e8ee18fa29
push job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:34:08 -08:00
4a708f9f5b
Merge pull request #3739 from vieux/events_jobs
...
move events to job
2014-01-24 15:32:25 -08:00
5cc6312bfc
move events to job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:28:17 -08:00
59df776469
Merge pull request #3621 from vieux/inspect_job
...
Inspect job
2014-01-24 15:22:20 -08:00
5fd8aa02ba
merge 2 jobs, no more buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:13:30 -08:00
a7e9baaf89
update attach to use the new job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:11:38 -08:00
134435a79c
move inspect to 2 jobs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:11:38 -08:00
22fb3e0f38
Merge pull request #3645 from vieux/rmi_job
...
Move rmi to a job
2014-01-24 15:10:02 -08:00
f41e0cf048
fix error handling
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:59:46 -08:00
177f658882
remove buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:57:18 -08:00
564e6bc780
Move docker rmi to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:55:11 -08:00
4a96c329c0
Merge pull request #3725 from vieux/pull_import_job
...
Pull import job
2014-01-24 14:47:40 -08:00
35641f0ec7
remove useless flush method
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:46:31 -08:00
90e9a2d85a
fix flush
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:46:31 -08:00
9dcbdbc4b1
move pull and import to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:46:31 -08:00
9d44298c5e
Merge pull request #3741 from vieux/build_job
...
move build to a job
2014-01-24 11:34:32 -08:00
56ec121925
Merge pull request #3726 from vieux/attach_stderr
...
don't user os.Stderr in attach
2014-01-24 10:55:55 -08:00
f1fbf5f219
Merge pull request #3748 from metalivedev/fixarticles
...
Fix TOC for Articles
2014-01-24 10:01:54 -08:00
6cae33ca0f
Fix TOC for Articles
2014-01-23 18:55:26 -08:00
641005777a
Merge pull request #3747 from crosbymichael/move-networking
...
Move IP Allocator into sub package and out of the core
2014-01-23 16:43:21 -08:00
42e35ecff3
remove useless anonymous field mentions
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-23 16:20:51 -08:00
415379e45d
move build to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-23 16:08:05 -08:00
Victor Vieux
Andy Rothfusz
Peter Waller
Abel Muiño
mattymo
Fabio Falci
Michael Crosby
Guillaume J. Charmes
Mike Naberezny
James Turnbull
Aaron Feng
Simon Taranto
Josh Poimboeuf