Commit Graph

74 Commits

Author SHA1 Message Date
0cb5ef58f2 Merge pull request #4011 from crosbymichael/add-netlink-functions
Add more netlink functions
Upstream-commit: 113629efb17dbb6af277d62259181899d0d031c9
Component: engine
2014-02-18 19:37:52 -05:00
e253c6c2c6 Merge pull request #4168 from crosbymichael/add-listenbuffer
Hold connections until the daemon has fully loaded
Upstream-commit: 4187f4e7504089d11740925a889e923f8adc54a7
Component: engine
2014-02-17 16:04:49 -08:00
e9b88ec705 Merge pull request #4153 from crosbymichael/move-proxy
Move proxy into pkg
Upstream-commit: 518670f3d82ad8f0a9568ef5231d5e4af26860b2
Component: engine
2014-02-17 14:51:16 -08:00
5f4d37b73d Remove verbose logging for non errors
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 055f1a1f8181d51d3386b4270f810efd59d51d30
Component: engine
2014-02-17 13:31:13 -08:00
d3c56b4c4a Make crosbymichael and creack netlink maintainers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a75c6907b48f730fe79c6c9ebfe22eeea6389f4a
Component: engine
2014-02-17 11:17:05 -08:00
9fdd3cd967 Change name to listenbuffer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d5e41c1cb67b7ccb86fbbd80079642afd5055c2a
Component: engine
2014-02-15 21:10:37 -08:00
7473a46910 Add socket activation for go apps
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cfb7711a74dc4b54d879f79bc2f6435ed71163b9
Component: engine
2014-02-15 20:18:47 -08:00
690b93143a Move proxy into pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8c39db8f96ac2a7ec479a679bc060410cee1a567
Component: engine
2014-02-14 15:48:05 -08:00
07f1d747db Add new functions to unsupported file
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 17719cab91e175a7bd11f9852e27638df1202b8b
Component: engine
2014-02-14 12:12:35 -08:00
68a1243dca Simplify code + Allow more generic attr children + remove prefix
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 38e5b4e70fb6b93aa2b86e4d625a0032b97b991a
Component: engine
2014-02-12 09:29:06 -08:00
1f519be2f8 Merge remote-tracking branch 'mike/add-netlink-functions' into implement_create_veth
Conflicts:
	pkg/netlink/netlink_linux.go

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: dce7b6a69c42fb64a99f873a5f7568799228c1e5
Component: engine
2014-02-12 04:17:12 -08:00
bcb95a4894 Implement create veth
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 2d2c237f50b7954993f6cd1db67c6f8c6d06f881
Component: engine
2014-02-12 04:09:56 -08:00
faccead7fb pkg/opts: a collection of custom value parsers implementing flag.Value
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e6e320acc757f22e113da755293583402c6c1e7c
Component: engine
2014-02-11 19:59:52 -08:00
ad55909560 Merge branch 'add-netlink-functions' of github.com:crosbymichael/docker into add-netlink-functions
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 34f5d94b2cfb0a5401b31f3b669ae6579d8126a8
Component: engine
2014-02-11 03:33:18 -08:00
3f55cc6f41 Add comment clarifying null termination
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c626349f651a660302f64101055d65dc6e990307
Component: engine
2014-02-11 10:32:31 -07:00
6d92748c6f Exec out to ip right now for creating the veth pair
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27ed9a9f98750ab666d6221553b6f4ea59d396b8
Component: engine
2014-02-11 03:32:35 -08:00
c0caaa92a3 Add more netlink functions for set ns by fd and bring iface down
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f9cd1be6ffbda85f20cc7926274fab7484a19823
Component: engine
2014-02-10 22:32:07 -08:00
1093e871da Allow add of empty name
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4dec36d1ee8cfd8b396210daa5367d146bbb34bc
Component: engine
2014-02-10 16:41:16 -08:00
3665663666 Merge pull request #3524 from tianon/supplementary-groups
Add supplementary groups lookup in sysinit
Upstream-commit: 2dcb48af0fa9bba2fb47b08dd2c9747acf09ea44
Component: engine
2014-02-10 14:42:14 -08:00
6da2235591 Create veth pair via netlink
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 38eabfa65c5be78a08a8287b600e230dbe0bfac5
Component: engine
2014-02-10 13:37:16 -08:00
5fb9dcf843 Improve get if socket loop
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27df18ff11dbfc22ca539462710abf07d507c0d9
Component: engine
2014-02-10 11:36:23 -08:00
aaca90f4b6 Update NetworkChangeName to be more similar to my original (moving IFNAMSIZ constant outside the function like it should've been)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3a7c144e9992591f32daf2d4f1b35b7b6520a07e
Component: engine
2014-02-09 18:14:17 -07:00
c36542fc7c Replace my C code with tianons Go code
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 524416560a4624d30023db32101c9fe5ebffc895
Component: engine
2014-02-09 05:54:13 -08:00
347c7fca0d Use c to change interface name
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ee39033073ece35e91c6c5a8cb66d23246511fb0
Component: engine
2014-02-08 20:44:04 -08:00
e66ed158d6 Add network set interface in namespace by pid
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e3762e8d6937741a5654b1443f95beb784f018f1
Component: engine
2014-02-08 10:03:16 -08:00
7920ed3ee7 Add set master for interface
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a6c791e8a92f29a2ae2c6bc81e4ab873d3ceb41f
Component: engine
2014-02-08 09:53:04 -08:00
bd67bce023 pkg: systemd: add initial MAINTAINERS
I volunteered for pkg/systemd MAINTAINER and there were no objections
during the #docker-dev meeting. For context I wrote most of the stuff in
here and wrote the dependent calls in api.go. Plus, I actively test the
code via CoreOS.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 15711ed670e8ab59611030ea1191189ad495ea63
Component: engine
2014-02-06 12:04:35 -08:00
126d36548e iptables: use dest_addr and dest_port for public port FORWARD rule
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
Upstream-commit: ea63ade772445591e78b42a36fa0dcfffa4a9f1a
Component: engine
2014-02-04 11:32:50 -06:00
57b57cdf8c Use type switch instead of reflection
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4ffc52385cec66cbd930bc6b5ab828ed65f43dbb
Component: engine
2014-01-31 20:15:24 -07:00
1ed42315f3 Move UserLookup functionality into a separate pkg/user submodule that implements proper parsing of /etc/passwd and /etc/group, and use that to add support for "docker run -u user:group" and for getting supplementary groups (if ":group" is not specified)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: ee93f6185be3ae73c16cf41ae397bae3ce2f6c55
Component: engine
2014-01-31 20:15:24 -07:00
535edc5a50 Merge pull request #3876 from dotcloud/fix_panic_mflag
fix panic in mflag
Upstream-commit: 78189c9bcf1b2ef8ebebbdb48c10b0ce0b8ae583
Component: engine
2014-01-31 14:43:16 -08:00
3044e71de0 Merge pull request #3841 from alexlarsson/separate-base-fs
Separate out graphdriver mount and container root
Upstream-commit: 53ee1daa699ab28fdd37d77b2cfbb0fc14dc0fdb
Component: engine
2014-01-31 11:49:14 -08:00
282ae4468c fix panic in mflag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 65794a2c4960f9065ee439d6823ffe670610dbb6
Component: engine
2014-01-31 11:39:29 -08:00
e8f6d5eb59 Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 065dd231dd7d7858df982a8decfade9df936cf63
Component: engine
2014-01-31 03:16:42 -07:00
185286d85e Remove all darwin specific files and use more generic _unsupported with build tags.
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 45dd051e8ee2e0e18d8ffec99f65878c20bd11e9
Component: engine
2014-01-30 23:10:56 +00:00
03793e4950 pkg/mount: Add "private" flag
This allows "mount --make-private" functionallity.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: fc1169a220196b78b73d5c1874d3c7bdc38d9fe3
Component: engine
2014-01-30 16:41:45 +01: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
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
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
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
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
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
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
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
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
f68d62aa35 Fix mflag test issue with "ResetForTesting" (which only showed up under dyntest for some odd reason)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f60eee4894cfa07e8a969425c72d291f80f3053a
Component: engine
2014-01-23 13:03:17 -07:00