github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 19:05:37 +00:00
Code Issues Projects Releases Wiki Activity
8,513 Commits 1 Branch 27 Tags 240 MiB
master
Commit Graph

8513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
9241e0c8df Merge pull request #177 from justincormack/ipvs 
add ipvs conntrack and other missing net options
 2016-06-06 23:18:19 +01:00
Justin Cormack
98fa1c0ef0 Merge pull request #176 from justincormack/kernelup 
update to linux 4.4.12 and aufs 20160530
 2016-06-06 23:18:04 +01:00
Justin Cormack
3db42c2753 add ipvs conntrack and other missing net options 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-06 23:17:44 +01:00
Dave Scott
95bd6a899e Merge pull request #155 from djs55/remove-individual-vsock-proxy 
proxy: remove the dynamic vsock port allocation
 2016-06-06 23:13:24 +01:00
Justin Cormack
6b5c0495f1 update to linux 4.4.12 and aufs 20160530 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-06 23:05:41 +01:00
Justin Cormack
d07731577a Merge pull request #174 from dsheets/transfused-prepare-mounts 
transfused: introduce automatic mount point preparation
 2016-06-03 17:33:21 +01:00
David Sheets
0d0413b264 transfused: introduce automatic mount point preparation 
Mount points are now made dynamically if either the leaf doesn't exist
or the leaf has no children. Any proper prefix of the target mount point may
or may not exist prior to mounting.

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-06-03 16:31:49 +01:00
Justin Cormack
223ef9f9db Merge pull request #173 from justincormack/wintmp 
fix #169 only do /tmp bind mount if /Mac/tmp exists
 2016-06-03 15:18:43 +01:00
Justin Cormack
5d80b5dfcd fix #169 only do /tmp bind mount if /Mac/tmp exists 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-03 15:15:20 +01:00
Justin Cormack
0e89621f76 Merge pull request #172 from justincormack/docker-1.11.2 
Update docker to 1.11.2+patches
 2016-06-03 13:28:11 +01:00
Justin Cormack
7e0f2bdfa7 Update docker to 1.11.2+patches 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-03 13:27:32 +01:00
Justin Cormack
f245c8ab63 Merge pull request #171 from justincormack/alpine3.4 
Update to Alpine 3.4
 2016-06-03 13:05:40 +01:00
Justin Cormack
e434c70507 Update to Alpine 3.4 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-03 12:45:15 +01:00
Justin Cormack
a450843a48 Merge pull request #168 from MagnusS/mount-tmp 
also bindmount /tmp once
 2016-06-03 09:07:34 +01:00
Magnus Skjegstad
420f92d3fa also bindmount /tmp once 
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
 2016-06-03 01:44:11 +01:00
Justin Cormack
05a519a7b6 Merge pull request #167 from dave-tucker/nohupper 
Remove hupper
 2016-06-02 20:44:03 +01:00
Dave Tucker
66372fe5e8 Remove hupper and mobyconfig watch 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-06-02 20:39:25 +01:00
Justin Cormack
e769c18281 Merge pull request #166 from justincormack/typo 
fix typo
 2016-06-02 13:56:46 +01:00
Justin Cormack
5832819473 fix typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-02 13:56:20 +01:00
Justin Cormack
9ad152aa6c Merge pull request #165 from justincormack/bindmount 
avoid rebindmounting directories on docker restart
 2016-06-02 13:19:21 +01:00
Justin Cormack
35cdbaf458 avoid rebindmounting directories on docker restart 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-02 13:18:27 +01:00
Justin Cormack
d0c8e5de01 Merge pull request #163 from nathanleclaire/bootflag 
Add 'bootflag' script to check kernel flags
 2016-06-02 11:58:44 +01:00
Nathan LeClaire
810d50aef0 Add 'bootflag' script to check kernel flags 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-06-01 15:30:53 -07:00
Rolf Neugebauer
312f45babb Merge pull request #162 from rneugeba/win-vpn-fix 
net: add metric to static IP address entries
 2016-06-01 20:10:26 +01:00
Rolf Neugebauer
6c8bcb150a net: add metric to static IP address entries 
The VPN interface is configure with a routing metric of 199. If VPN mode
is enabled and we have static IP address configured (which is what we do
on Windows) then all traffic would still go via eth0 and not, as expected,
via the VPN interface.

With this PR we set the metric for eth1 to 200, thus, if VPN mode enabled
traffic will be routed over the VPN interface.

This fix is a bit Uggh, but it's the simplest way to apply this late in the
release cycle without requiring re-run of all OS X tests.

We should fix this properly after this release.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-06-01 19:59:58 +01:00
Justin Cormack
14ace6d526 Merge pull request #160 from ijc25/master 
Ensure /var/log is bind mounted after transfused starts
 2016-05-31 15:39:15 +01:00
Ian Campbell
065374f443 Ensure /var/log is bind mounted after transfused starts 
Otherwise /Mac$DRIVERDIR does not yet exist.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-05-31 15:26:41 +01:00
Justin Cormack
41d71a29ce Merge pull request #159 from justincormack/diag 
update diagnostics now tap-vsockd only runs on WIndows
 2016-05-31 15:08:19 +01:00
Justin Cormack
41c1231c47 update diagnostics now tap-vsockd only runs on WIndows 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-31 15:07:33 +01:00
Rolf Neugebauer
be61d79537 Merge pull request #152 from rneugeba/net-config 
[DO NOT MERGE (yet)] config: overwrite resolv.conf and interfaces from database
 2016-05-30 14:24:37 +02:00
Rolf Neugebauer
81c8a2a53d config: overwrite resolv.conf and interfaces from database 
Allow the host to configure a static IP address for eth0 by setting the
following DB keys:
- net/config: "static" (default or not set -> dhcp)
- net/address: IP address
- net/netmask: netmask in dot notation
- net/gateway: default gateway

Also allow overwriting/setting "/etc/resolve.conf" by writing to
the "etc/resolv.conf" key.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-30 10:01:42 +02:00
Justin Cormack
d14b248205 Merge pull request #158 from justincormack/driverdir 
define driverdir in host setting
 2016-05-27 12:05:23 -07:00
Justin Cormack
171921dc9e define driverdir in host setting 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-27 12:04:49 -07:00
Justin Cormack
79409e4d00 Merge pull request #157 from justincormack/movemount 
move log mount to hostsettings not docker startup
 2016-05-27 11:47:39 -07:00
Justin Cormack
a597292272 move log mount to hostsettings not docker startup 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-27 11:41:46 -07:00
Justin Cormack
a6ceb0a580 Merge pull request #156 from justincormack/nologcopy 
Do not try to keep log files, fix #154
 2016-05-26 14:57:53 -07:00
Justin Cormack
4f7f9cd2fa Do not try to keep log files, fix #154 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-26 14:24:05 -07:00
David Scott
a6a1c4b1a6 proxy: remove the dynamic vsock port allocation 
On both Mac and Windows we have one well-known port and a SOCKS-like
port to tunnel connections through it. This was necessary on Windows
where ports have well-known GUIDs, but we might as well do it the same
way on both platforms for consistency.

This patch removes the dynamic binding of vsock ports, which fails on
a Windows Moby anyway.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-26 17:01:27 +01:00
Dave Scott
8bc6e72020 Merge pull request #148 from djs55/port-filesystem 
On Hyper-V, mount the /port filesystem
 2016-05-26 02:51:39 -07:00
Rolf Neugebauer
0f3ef552e1 Merge pull request #151 from rneugeba/virtsock-up 
virtsock: update vendored virtosck package
 2016-05-23 21:36:04 +01:00
Rolf Neugebauer
8d38a260a7 virtsock: update vendored virtosck package 
This fixes a bug on WIndows build newer than 10586.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-23 21:34:38 +01:00
Dave Scott
53cc46fe71 Merge pull request #150 from rneugeba/kernel-patches-update 
kernel: update kernel patches
 2016-05-23 12:44:08 -07:00
Rolf Neugebauer
8d32faa823 Merge pull request #149 from djs55/fix-windows-sharing 
Hyper-V: mount the filesystem from the default gateway via eth0
 2016-05-23 19:35:03 +01:00
Rolf Neugebauer
07a5affe3b kernel: update kernel patches 
Added a patch to reduce verbosity of vmbus for unknown GUIDs.
Thes happen on every Hyper-V socket connection.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-23 19:01:13 +01:00
Dave Scott
84902f1a55 Merge pull request #131 from djs55/9pmount-vsock 
On Hyper-V, mount the database 9P filesystem
 2016-05-23 10:24:59 -07:00
David Scott
cce2fd4f85 Hyper-V: mount the filesystem from the default gateway via eth0 
When running in VPN mode eth0 and eth1 have default routes, but
eth1 has the lowest metric. However the host CIFS server can
only be contacted via eth0, so always use the eth0 address.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-23 18:18:32 +01:00
David Scott
b921ae7c36 On Hyper-V, mount the /port filesystem 
This allows localhost port forwards to be requested if

  native/port-forwarding=true

if set.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-22 18:43:07 +01:00
Dave Scott
6288e9826c Merge pull request #146 from djs55/port-vsockd 
proxy: add a multiplexing server frontend
 2016-05-22 04:51:53 -07:00
Dave Scott
f5aa6fe66a Merge pull request #147 from djs55/error-on-startup 
tap-vsockd: only try to start on Hyper-V
 2016-05-22 04:51:34 -07:00
David Scott
d46052773d proxy: update the 9P protocol 
We now tell the 9P server

 proto1:ip1:port1:<address for forwarding>

which means please listen on proto1:ip1:port1, then connect to the port
proxy in Moby and tell it the connection is for <address for forwarding>.

Note this requires a corresponding change in hostnet/vpnkit.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-22 12:43:24 +01:00