github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 18:41:37 +00:00
Code Issues Projects Releases Wiki Activity
8,485 Commits 1 Branch 27 Tags 240 MiB
66ca00915a
Commit Graph

8485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
713d7e8209 Merge pull request #88 from dsheets/hostsettings-etc-sysctl.conf 
hostsettings: correctly install multiline /etc/sysctl.conf files
 2016-04-15 10:58:49 +01:00
David Sheets
d99812e7d3 hostsettings: correctly install multiline /etc/sysctl.conf files 
echo will destroy newlines in arguments.

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-04-15 10:57:32 +01:00
Dave Tucker
c5cbb9aaa2 Add util-linux for K8's 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-04-14 18:27:00 +01:00
David Sheets
a49bb9a4b2 Merge pull request #86 from dsheets/transfused-event-stream 
transfused: update the event protocol for streaming vsock
 2016-04-14 15:07:02 +01:00
David Sheets
b894b67417 transfused: update the event protocol for streaming vsock 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-04-14 14:57:06 +01:00
Dave Scott
43c35b842c Merge pull request #85 from djs55/docker.1.11.0 
Bump docker to 1.11.0 final
 2016-04-13 22:52:07 +01:00
David Scott
6c18dec743 docker: switch the branch to djs55/moby temporarily 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-13 22:50:40 +01:00
David Scott
a6fb594b44 Bump docker to 1.11.0 final 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-13 21:43:17 +01:00
Justin Cormack
32e840da1b Merge pull request #81 from dsheets/transfused-vsock 
transfused: use vsock transport instead of 9p
 2016-04-13 14:53:34 +01:00
Justin Cormack
2d492afe50 Merge pull request #83 from ijc25/hyperv-sockets 
hyperv-socks: Backport patches.
 2016-04-13 14:53:01 +01:00
Justin Cormack
67ed7e1cdf add more dockerignores 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-13 11:24:31 +01:00
David Sheets
cb08ad76d3 transfused: use vsock transport instead of 9p 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-04-12 16:38:06 +01:00
Justin Cormack
aaebcf5866 be better at checking strings which aere mainly empty 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-12 15:38:18 +01:00
Justin Cormack
0390b2ba4d Merge pull request #80 from ijc25/vsock 
Update vsock patches
 2016-04-12 15:02:10 +01:00
Ian Campbell
5aa8173876 hyperv-socks: Backport patches. 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-12 14:36:58 +01:00
Ian Campbell
f2171c7beb Update vsock patches 
Upstream commit 598881800825 ("vsock: Fix blocking ops call in
prepare_to_wait") was subsequently reverted in 6f57e56a1527, which said:

    The commit reverted with this patch caused us to potentially miss wakeups.
    Since the condition is not checked between the prepare_to_wait and the
    schedule(), if a wakeup happens after the condition is checked but before
    the sleep happens, we will miss it. ( A description of the problem can be
    found here: http://www.makelinux.net/ldd3/chp-6-sect-2 ).

The underlying issue has been fixed instead with f7f9b5e7f8ec ("AF_VSOCK:
Shrink the area influenced by prepare_to_wait").

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-12 14:33:32 +01:00
Justin Cormack
4b0116ea07 bump to docker 1.11.0-rc5 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-12 10:28:25 +01:00
Justin Cormack
53116c29a5 Merge pull request #76 from djs55/clunk-port 
proxy: keep the fd open to the control file
 2016-04-11 22:09:35 +02:00
David Scott
d5f25d2727 proxy: keep the fd open to the control file 
A future version of the 9P server will shutdown the forward on 9P
clunk, so if this process crashes the forward will be cleaned up
properly.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-11 18:27:11 +01:00
Justin Cormack
e49fff3c5e fix hupper path 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 16:10:28 +01:00
Justin Cormack
9844e5f82f empty config files should not be marked for exists 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 13:41:17 +01:00
Justin Cormack
bd0d295eaf use docker git fork for our patches version, rather than having patches here, for more transparency 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 12:32:11 +01:00
Justin Cormack
713af4332b clean up config options 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 11:09:55 +01:00
Justin Cormack
9be06ba517 Merge pull request #73 from ijc25/vsock 
vsudd bugfixes
 2016-04-08 16:05:36 +01:00
Ian Campbell
dad42c8dc4 vsudd: Close via the File vsock not the raw fd. 
Otherwise the underlying gets closed twice, once by the File's finalizer (which
occurs at whichever point vsock appears no longer used) and another time by the
syscall.Close(), which leads to EBADF. The various syscall.shutdown can also
suffer from this if the File happens to get finalized first, but the reference
in the defer'd function now keeps the File alive until we are truly done with
the socket.

This seems to resolve the random stalls and failures seen in "make test".

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-08 15:08:10 +01:00
Ian Campbell
113ca08cae vsudd: Log as we Close both sockets (via defer) 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-08 15:08:10 +01:00
Ian Campbell
777ddec6b8 vsudd: Bind to VSOCK_CID_ANY rather than "3" 
This is equivalent to binding to 0.0.0.0 rather than a specific IP address.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-08 15:08:10 +01:00
Ian Campbell
d82a23a399 vsudd: Log the peer's port number 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-08 15:08:10 +01:00
Ian Campbell
a8e3b55775 vsudd: include fd in vsock File object name (used in logs) 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-08 15:08:10 +01:00
Justin Cormack
293a1eb23d change find to use keys, fix /etc/docker copying using find 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 14:03:43 +01:00
Justin Cormack
dba240e1f5 add insecure registry support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:47:44 +01:00
Justin Cormack
4993204e9d add a find option to mobyconfig 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:37:11 +01:00
Justin Cormack
32c895765f allow use of any files under /etc/docker eg /etc/docker/certs.d/ 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:28:15 +01:00
Justin Cormack
a60e4c92c8 path works for directories too 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:27:18 +01:00
Justin Cormack
efec39212d exists allows directories too in mobyconfig 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:25:35 +01:00
Justin Cormack
9f5e02bbdf add directory test to mobyconfig 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:23:23 +01:00
Justin Cormack
5847bb7eb1 more uses of moobyconfig in docker config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:14:19 +01:00
Justin Cormack
888ef34ffc add path option to mobyconfig 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:08:25 +01:00
Justin Cormack
64b16c1dc3 use mobyconfig some more in docker config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:06:55 +01:00
Justin Cormack
32cba7db3a fix check in config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 11:15:16 +01:00
Justin Cormack
0acd6c8196 remove 9pinit package, work now done by appropriate packages or mobyconfig tool 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 16:40:54 +01:00
Justin Cormack
c1684dd7d0 hupper need not check for database 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 16:28:20 +01:00
Justin Cormack
7e0a5ad781 use mobyconfig watch for hupper 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 16:27:24 +01:00
Justin Cormack
ea9062f7e6 support watch paths on mobyconfig 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 16:25:32 +01:00
Justin Cormack
0106abbf96 start vsudd before docker 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 15:11:35 +01:00
Justin Cormack
aa0fd62747 rename database to hostsettings 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 15:11:20 +01:00
Justin Cormack
cff0230cbb use config tool for host settings 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 14:58:35 +01:00
Justin Cormack
1d1626e449 add mobyconfig tool for simpler config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 14:58:12 +01:00
Justin Cormack
40814e4779 put hupper config in config file 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 14:07:35 +01:00
Justin Cormack
73a0d72378 move transfused 9p mount into its own init file 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 10:35:50 +01:00