Commit Graph

5442 Commits

Author SHA1 Message Date
61ba43da9f Merge pull request #3105 from philips/add-socket-activation
Add socket activation
Upstream-commit: 2723133a69a292abaa021afff98de127bda57b4e
Component: engine
2014-01-28 11:38:25 -08:00
c17d7923cb remove ip_forward warning
Now that docker sets /proc/sys/net/ipv4/ip_forward by default (unless
the user manually specifies "-ip-forward=false"), there's no need to
warn if its disabled.

Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
Upstream-commit: ef6c0d53410c0be6f33d049e7998b54804497350
Component: engine
2014-01-28 13:27:56 -06:00
33ad91ccbb Merge pull request #3801 from tianon/ip-forward
Add --ip-forward flag to daemon (enabled by default)
Upstream-commit: 4ab59179e76dc2311422c2ebdeafca279dc94b65
Component: engine
2014-01-28 11:17:45 -08:00
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
07c81f6fbb Add --ip-forward flag to daemon (enabled by default) which automatically sets "net.ipv4.ip_forward" to 1
See also https://groups.google.com/d/topic/docker-dev/DCjF5Prx7HA/discussion

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cabe624c823348579ada234e3c029479683f624c
Component: engine
2014-01-27 21:35:05 -07:00
6cb1f34158 fix(api): , _ removed to simplify code in range
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 4e5859e8300e7c56f28ca07c47131d14f6cf8632
Component: engine
2014-01-27 17:18:09 -08:00
f715944faf chore(coreos/go-systemd): copy to github.com/dotcloud/docker/systemd/pkg/activation
Via https://github.com/dotcloud/docker/pull/3105#issuecomment-32807547

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 7839350dd582cc0f08b5e0de735d57baa08328ff
Component: engine
2014-01-27 17:18:09 -08:00
1ce079fc31 chore(systemd): use activation.Listeners instead of Files
Use this Listeners() API that was exposed to save a few more lines of
boiler plate code.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: def09526066001eefe16dbc6475b93bc1a9af0a2
Component: engine
2014-01-27 17:18:09 -08:00
25f4ec26df vendor: bump github.com/coreos/go-systemd/activation
tests now work in the Docker tree with

`go test github.com/coreos/go-systemd/activation`

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: f82d1291cc850b39d872d022feac6b9eb7773d64
Component: engine
2014-01-27 17:18:09 -08:00
b82cbc2144 chore(*): go fmt
I noticed that travis was failing, go fmt to make it happy.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 1603039a7150e0510853efc9a9733ef64508dbb0
Component: engine
2014-01-27 17:18:09 -08:00
e0523eee43 fix(contrib/init/systemd): remove mount rprivate
Docker does this now via 157d99a72786c454dfaad8b0800914cc80879aa8

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 1f44921c51883e923ed82ed4e30eca6f79702cfb
Component: engine
2014-01-27 17:18:09 -08:00
599a6cd34c fix(cli.rst): add missing underscores
As suggested by @metalivedev

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 2fe7588af79bbc61e758ff066be1cf1c2d381f7b
Component: engine
2014-01-27 17:18:09 -08:00
7f4461fb98 Allow fd:// like unix:// and tcp://
Somthing like 20605eb310f0b57bd06eea80ec63c5022fc83bde

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 7f9d3268bf0e1d4a79d07c67e22eb14d3de96f6c
Component: engine
2014-01-27 17:18:09 -08:00
843c8c74fb Move listenfd to utility package
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 566fb31c889cfa05c617f44e6c99d44578d643a5
Component: engine
2014-01-27 17:18:09 -08:00
5197c3fef9 fix(docs): add Systemd in front of socket activation
Suggested by SvenDowideit.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 6acc99889d97638d632a2974e04cd91ed4036c4b
Component: engine
2014-01-27 17:18:09 -08:00
efeecbbbfb docs: improve the socket activation cli docs
as suggested by SvenDowideit expand the docs to have more information on
socket activation.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 4a90f00ab7ec9e534c97611dbbdc412ed5966602
Component: engine
2014-01-27 17:18:09 -08:00
bbf27c35bb fix(docs): fixup based on changes in master
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: cfeb1f0f652e11b8b6a8b4e1cbed3835fc5d9546
Component: engine
2014-01-27 17:18:09 -08:00
93246312a1 server: add socket activation
This adds the ability to socket activate docker by passing in
`-H fd://*` along with examples systemd configuration files.

The fastest way to test this is to run:

```
/usr/lib/systemd/systemd-activate -l 127.0.0.1:2001 /usr/bin/docker -d -H 'fd://*'
docker -H tcp://127.0.0.1:2001 ps
```

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 87fb2c973d8f9a8a1868ab0c2da504095d04715b
Component: engine
2014-01-27 17:17:07 -08:00
1cbc4221a3 vendor: add github.com/coreos/go-systemd/activation
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: e996daeed08defbab8864be1e26cd1294b12af87
Component: engine
2014-01-27 17:17:07 -08: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
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
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