Andy Rothfusz
093531ddb7
Merge pull request #3781 from mattymo/patch-1
...
Clean up grammar on puppet.rst
2014-01-27 12:06:43 -08:00
Ben Firshman
2abf25d827
Clarify services line in readme
2014-01-27 20:04:48 +00:00
Andy Rothfusz
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
Andy Rothfusz
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
Ben Firshman
837593e1ab
Clarify line about services
2014-01-27 19:38:30 +00:00
Ben Firshman
274728e5fb
Update homepage in setup.py
2014-01-27 18:42:00 +00:00
Victor Vieux
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
Ben Firshman
51fb2e6149
Clearer introduction in readme
2014-01-27 18:18:53 +00:00
Ben Firshman
cc29b21bfc
Clearer introduction
2014-01-27 18:16:57 +00:00
Ben Firshman
00f5c3bb85
Remove magical comments from readme
2014-01-27 18:12:29 +00:00
Ben Firshman
33795912ff
Point readme at documentation
2014-01-27 18:11:40 +00:00
Aanand Prasad
92a2deb979
Update homepage title
2014-01-27 18:05:42 +00:00
Aanand Prasad
40fad23e0b
Fix Dockerfile in Rails example
...
was missing libpq-dev
2014-01-27 18:00:47 +00:00
Ben Firshman
6c8472dd67
Make strapline smaller on mobile
2014-01-27 18:00:47 +00:00
Aanand Prasad
a9838e9116
Update environment variable names in reference
...
Scheme was changed in 3e7e6e7656
2014-01-27 18:00:47 +00:00
Aanand Prasad
01d0e49a1c
New website
2014-01-27 18:00:47 +00:00
Aanand Prasad
ddc721ec8a
Merge pull request #55 from orchardup/ship-0.1.4
...
Ship 0.1.4
2014-01-27 09:57:46 -08:00
Ben Firshman
5035a10cbe
Ship 0.1.4
2014-01-27 17:57:02 +00:00
Aanand Prasad
fae387168f
Merge pull request #54 from orchardup/add-link-alias-without-project-name
...
Add link alias without project name
2014-01-27 09:43:22 -08:00
Peter Waller
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
Ben Firshman
5d71c33cd7
Only install unittest2 on Python 2.6
2014-01-27 16:20:45 +00:00
Ben Firshman
9a5a021f91
Rewrite introduction
2014-01-27 16:08:00 +00:00
Ben Firshman
3e7e6e7656
Add link alias without project name
...
REDIS_1_PORT_6379_TCP_ADDR instead of
FIGTEST_REDIS_1_PORT_6379_TCP_ADDR.
Ref #37
2014-01-27 15:32:16 +00:00
Ben Firshman
1bab14213d
Update docker-py
...
From 0a9512d008
2014-01-27 15:29:31 +00:00
Abel Muiño
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
mattymo
551e1a766c
Update puppet.rst
2014-01-27 18:21:48 +03:00
Aanand Prasad
db396b81ef
Just deploy the _site directory to gh-pages
2014-01-27 12:26:42 +00:00
mattymo
03d9984f17
Clean up grammar on puppet.rst
2014-01-27 15:13:17 +03:00
Aanand Prasad
f60621ee1b
Move docs to master branch
...
- build with script/build-docs
- deploy with script/deploy-docs
2014-01-27 11:51:15 +00:00
Ben Firshman
7c9c55785d
Move mock to dev requirements
2014-01-27 10:00:36 +00:00
Fabio Falci
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Guillaume J. Charmes
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
Michael Crosby
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
Ben Firshman
8f8b0bbd16
Revert "Remove Travis badge"
...
This reverts commit ac90e0e939 .
2014-01-26 21:29:59 +00:00
Ben Firshman
ddf6819a75
Only pull ubuntu:latest in tests
...
Might stop Travis running out of disk space.
2014-01-26 20:37:40 +00:00
Ben Firshman
ee49e7055b
Pull ubuntu image for CLI tests
2014-01-26 20:29:05 +00:00
Tianon Gravi
b994c13159
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-26 13:24:03 -07:00
Ben Firshman
ac90e0e939
Remove Travis badge
...
Travis is running out of disk space.
2014-01-26 19:54:00 +00:00
Mike Naberezny
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
Ben Firshman
ea93c01dfb
Remove intermediate containers in recreate test
2014-01-26 19:48:10 +00:00
Ben Firshman
cf18a3141f
Remove images created by tests
2014-01-26 19:37:35 +00:00
James Turnbull
ffdc2d2657
Merge pull request #3771 from srt32/patch-1
...
Update README.md typo
2014-01-26 09:07:00 -08:00
Aaron Feng
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
Simon Taranto
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
Josh Poimboeuf
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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