Commit Graph

5482 Commits

Author SHA1 Message Date
38ee88c4ce fix TestExitCode
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 720f64af1855235b6f518ad97dbb89eb61191222
Component: engine
2014-01-30 22:59:21 +00:00
d1401083fb remove TestAllocateTCPPortLocalhost faillure in tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8e619e13ca3906e849944a4b015b676b93c9f145
Component: engine
2014-01-30 21:53:32 +00:00
827d047fb2 Merge pull request #3833 from vieux/fix_env_conversion_issues
Fix env conversion issues in env
Upstream-commit: 0c8ddd502e90d5e35c04179f98f29fc4550af5c9
Component: engine
2014-01-30 13:31:25 -08:00
deac379ef5 refactor all *FromJob functions
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9261511aa509423432f4e22f6235719deadc0969
Component: engine
2014-01-30 20:45:32 +00:00
aea7223441 Merge pull request #3842 from jpoimboe/iptables-insert-masq
network: insert masq rule
Upstream-commit: 0942e5c89cb8554cb50a680df0004abee63bb0d1
Component: engine
2014-01-30 11:26:32 -08:00
41e844d181 Merge pull request #3836 from SvenDowideit/mint-cgroups-lite-docs
Add troubleshooting for missing cgroups on mint 16
Upstream-commit: 43b7667dccc4a08cf12a17548df359e0ba118ae1
Component: engine
2014-01-30 10:58:26 -08:00
40e944384d Merge pull request #3846 from tianon/unclejack-maintainer
Make unclejack the official Vagrantfile maintainer
Upstream-commit: c7b415d3b4904ba5b00ed60e544bf9eadccd2219
Component: engine
2014-01-30 10:55:38 -08:00
1cbb6220de Make unclejack the official Vagrantfile maintainer
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 238dba831a74c89fe8f5aabc836e6b75da577c97
Component: engine
2014-01-30 11:51:25 -07:00
c5b80fe410 Merge pull request #3718 from alexlarsson/btrfs
Add btrfs support to docker
Upstream-commit: 637a1dcab65c7335d979d42af190a53d9bbea9f7
Component: engine
2014-01-30 10:00:44 -08:00
a2aa12eced network: insert masq rule
This fixes IP masquerading on systems with reject rules at the end of
the POSTROUTING table, by inserting the rule at the beginning of the
table instead of adding it at the end.

Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
Upstream-commit: cc382ec62848855f6fe7302fe7a37ac62af35a9c
Component: engine
2014-01-30 11:06:28 -06:00
29c6c509be Add troubleshooting for missing cgroups on mint 16 #3602
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 626a2e1112b6e802415f80ff7a3682296636f55a
Component: engine
2014-01-30 20:53:27 +10:00
d5c4282d8f Merge pull request #3835 from thinkingbox/master
Fix typo
Upstream-commit: 41c10fb25632ba5bc65a78e84c2f851e93f80ee4
Component: engine
2014-01-29 23:55:36 -08:00
be70505326 Fix typo
Docker-DCO-1.1-Signed-off-by: Piergiuliano Bossi <pgbossi@gmail.com> (github: thinkingbox)
Upstream-commit: 7d95ce6ddda89a392b94c6dcfcb7774b2a19cf1a
Component: engine
2014-01-29 23:07:23 -05:00
0e8d28d6ec contrib: systemd: make socket-activation Restart=always
Do as was done to f09a78cd219b24d4308034c8dd13410cfe5fbec7 in the
socket-activation example.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 4dab34c2045b7bcc735227867126f0796cbb09c1
Component: engine
2014-01-29 17:42:32 -08:00
805774b4d2 Merge pull request #3531 from lsm5/docker-systemd
ExecStartPre commands updated in systemd service file
Upstream-commit: de8480f6567778516a371fa8405df0409181cc32
Component: engine
2014-01-29 17:38:10 -08:00
c7071fbcda fix convertion issues
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 187646127fa80a5ba39a53619b410eb2a13f0ffd
Component: engine
2014-01-30 00:56:42 +00:00
5eea23ed5b add tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5b82a1b726291d4aaaad797df5b29a74de28d318
Component: engine
2014-01-30 00:55:29 +00:00
0a0316537a Merge pull request #3734 from stpierre/mkimage-yum
Added new mkimage-yum.sh script to create CentOS base images
Upstream-commit: 95dff84728493ff8d5ac2805473686afb70323f3
Component: engine
2014-01-29 14:52:51 -08:00
91a0b7d691 Merge pull request #3810 from jpoimboe/iptables-forward-public-ports
network: add publicly mapped ports to FORWARD table
Upstream-commit: 6013cbdce85b18a963750195c53f8676c5979690
Component: engine
2014-01-29 11:53:26 -08:00
6076f1f3f8 Merge pull request #3819 from crosbymichael/move-port-mapper
Move port mapper out of core and into network drivers
Upstream-commit: 6fdc5434436f5c3807274f524e8eaa3f0a009613
Component: engine
2014-01-29 11:16:51 -08:00
87c7be2925 Merge pull request #3808 from alexlarsson/execdriver-get-pids-for-container
execdriver: Make GetPidsForContainer() a driver call
Upstream-commit: c00cb1aca15c4dea4198c4e488a986fa6ad9636c
Component: engine
2014-01-29 10:38:10 -08:00
a3e4de072b Merge pull request #3820 from vieux/remove_runtime_from_api
Remove runtime from api
Upstream-commit: 4a351464614a40e9056007e5fa60e134eaeb6781
Component: engine
2014-01-29 10:35:27 -08:00
86c10c5a7d Merge pull request #3588 from tianon/debootstrap-tweaks
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
Upstream-commit: e1b210bee95b894c21f74f1df0efdfe0d6e93c56
Component: engine
2014-01-29 08:42:14 -08:00
667c92d38b remove ip fowarding from systemd (fixed: commit #3801)
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)
Upstream-commit: a9d0bbcfc6e45817f39f15a7c9b11305b4c04bad
Component: engine
2014-01-29 11:06:23 -05:00
5e880285ec ExecStartPre commands updated
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)

systemd service no longer does '/bin/mount/ --make-rprivate /'.
Core issue fixed by Alex Larsson (commit 157d99a).

ip forwarding enabled.
Upstream-commit: f09a78cd219b24d4308034c8dd13410cfe5fbec7
Component: engine
2014-01-29 11:06:23 -05:00
ea8660fa0f Merge pull request #3813 from jpoimboe/update-ip_forward-docs
docs: remove ip_forward enabling step
Upstream-commit: c82a2d1adfb2b2a838a12e0c3baea1d42fe7f3ad
Component: engine
2014-01-28 18:08:22 -08:00
2a8b1349cd move warnings to the job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: abd64a2b00a57dda2f24326fc49b7ca10e950dff
Component: engine
2014-01-29 01:17:55 +00:00
4971da5034 Move port mapper tests out of core and into portmapper
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b3b12f00593d96c6d0e93f9e333ee368278e871d
Component: engine
2014-01-28 17:10:13 -08:00
4f8cce969a remove enableCors from the config and move it as a job arg
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d41844ed2d946fc963f9977991233b5d9daf86fd
Component: engine
2014-01-29 00:20:51 +00:00
b8f930d15c Initial move of port mapper code into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 99756ef11fc2a3ae821bb412607e7e9b322f278a
Component: engine
2014-01-28 15:42:46 -08:00
93d7183e4e Merge pull request #3794 from vieux/fix_commands_error
check for errors in call, not readBody
Upstream-commit: fc697e3fd759b07f897ed2e61cf3a1916c7fb460
Component: engine
2014-01-28 12:57:02 -08:00
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
cf3378c12f docs: remove ip_forward enabling step
Now that docker sets /proc/sys/net/ipv4/ip_forward by default, remove
the step to enable it in the installation docs.

Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
Upstream-commit: aeb2f479fa1c063867475a610ddbfe4f8883dfda
Component: engine
2014-01-28 13:29:27 -06: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
261cb491a3 network: add publicly mapped ports to FORWARD table
Allow publicly mapped ports to be made public beyond the host.  This is
needed for distros like Fedora and RHEL which have a reject all rule at
the end of their FORWARD table.

Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
Upstream-commit: db250f709ad5bcee313710d34e0b6ef02abdc326
Component: engine
2014-01-28 13:11:49 -06: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
4729a480ab execdriver: Make GetPidsForContainer() a driver call
The current implementation is lxc specific.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 335bc39c9a5abfdbd07914ae1b8667a9d8590a6e
Component: engine
2014-01-28 16:21:49 +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
658be79c83 btrfs: Add comment to Put()
Document why we don't need to do anything in Put().

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a1851a6d3e69d67bfc4e6bfdec85ba58293351b9
Component: engine
2014-01-28 09:56:51 +01: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