github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-29 13:38:00 +00:00
Code Issues Projects Releases Wiki Activity
494 Commits 1 Branch 27 Tags 240 MiB
f23342b5ce
Commit Graph

494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Scott
f23342b5ce 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
29146734e5 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
4685b8af9e 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
3ab88ca363 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
0204af5064 Merge pull request #83 from ijc25/hyperv-sockets 
hyperv-socks: Backport patches.
 2016-04-13 14:53:01 +01:00
Justin Cormack
dca29bd197 add more dockerignores 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-13 11:24:31 +01:00
David Sheets
52feb0c4d5 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
72d0b35f0c 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
9705567f78 Merge pull request #80 from ijc25/vsock 
Update vsock patches
 2016-04-12 15:02:10 +01:00
Ian Campbell
1285fd4aa6 hyperv-socks: Backport patches. 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-12 14:36:58 +01:00
Ian Campbell
c0113ed91e 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
0d45d82b7b 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
697ecd0f1d 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
05d6df42bb 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
e4680e612b fix hupper path 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 16:10:28 +01:00
Justin Cormack
67d9192819 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
178f331c66 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
b76032f9fe clean up config options 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 11:09:55 +01:00
Justin Cormack
ae29f6a5d4 Merge pull request #73 from ijc25/vsock 
vsudd bugfixes
 2016-04-08 16:05:36 +01:00
Ian Campbell
54e31f7495 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
057fb53a6a 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
5c0fd63265 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
1332aef41b 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
dd22c1bf18 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
43c22fcffa 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
167123a363 add insecure registry support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:47:44 +01:00
Justin Cormack
a8a2905367 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
885cdd15f9 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
65c01ca277 path works for directories too 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:27:18 +01:00
Justin Cormack
d921b04067 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
c9b832fec2 add directory test to mobyconfig 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:23:23 +01:00
Justin Cormack
6859c551ee 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
993abcdb76 add path option to mobyconfig 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:08:25 +01:00
Justin Cormack
6b396e200c 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
c8ad2e11f9 fix check in config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 11:15:16 +01:00
Justin Cormack
3c9c67bb16 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
69139c1ec9 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
952a3e53c9 use mobyconfig watch for hupper 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 16:27:24 +01:00
Justin Cormack
8b5044e040 support watch paths on mobyconfig 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 16:25:32 +01:00
Justin Cormack
fcc1f73780 start vsudd before docker 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 15:11:35 +01:00
Justin Cormack
793265c48d rename database to hostsettings 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 15:11:20 +01:00
Justin Cormack
4c624af8ac 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
20e6da1cc3 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
07d4d9f920 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
d8001a2475 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
Justin Cormack
b1cbf3e96f move proxy 9p mounting into its own init file 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 10:31:08 +01:00
Justin Cormack
a6b0c50198 update to -rc4 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 09:55:57 +01:00
Justin Cormack
6ce61c6b3d Merge pull request #69 from ijc25/vsock 
Add frontend support for virtio-vsock
 2016-04-06 15:55:41 +01:00
Justin Cormack
caf3b90d1e fallback to alpine distfiles if upstream source has gone missing, fix #70 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-06 10:50:20 +01:00
Justin Cormack
3c97c540be remove more kexec code 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-06 10:28:15 +01:00