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
309 Commits 1 Branch 27 Tags 240 MiB
2180d0d2ed
Commit Graph

309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
2180d0d2ed shift rest of these to using compose 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-18 15:35:35 +00:00
Justin Cormack
ff917e07f7 use driverDir not groupDir 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-18 11:19:52 +00:00
Justin Cormack
6b93135b2c Merge pull request #32 from dave-tucker/armfix 
Fix ARM Builds
 2016-02-17 18:09:30 +00:00
Dave Tucker
1f80e1ed03 Fix ARM Builds 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-02-17 17:59:21 +00:00
Dave Scott
503fe76b13 Merge pull request #31 from djs55/remove-driverDir 
Remove driverDir, use groupDir
 2016-02-17 15:52:21 +00:00
Justin Cormack
1b6484052a remove bind mounts from 9pinit 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 14:22:55 +00:00
Justin Cormack
1bbaceaf84 bind mount at docker start 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 14:17:40 +00:00
Justin Cormack
bcc29d49e9 typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 14:11:13 +00:00
Justin Cormack
31886b91ad also bind mount when using fuse 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 13:56:08 +00:00
Justin Cormack
5d1cb9a046 start using docker compose for build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 13:53:27 +00:00
David Scott
4d7a431b40 Bind mount ${groupDir}/log as /var/log 
Before this patch we would bind mount ${groupDir} as /var/log,
but we wish to put data files in the group dir, so we should move
the logs to a subdirectory.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-02-17 13:50:54 +00:00
David Scott
3a8c5d77c0 docker: write ip in groupDir, not driverDir 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-02-17 13:49:41 +00:00
Justin Cormack
4b95bbdd02 bind mount Mac directories to top level 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 11:51:52 +00:00
Justin Cormack
3ff475520c add openssh client, as docker needs it for ssh based git clones 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 09:15:11 +00:00
Justin Cormack
2b28fd5124 Merge pull request #30 from djs55/avoid-socket9p 
Use IP rather than socket9p for the docker socket
 2016-02-15 15:15:25 +00:00
David Scott
6e20f932c3 Use IP rather than socket9p for the docker socket 
Before this patch, docker would only listen on 0.0.0.0:2375 if running
on Hyper-V. This patch makes it listen there on all hypervisors.

In the case of xhyve, it will listen on the host internal vmnet network
or the virtual slirp network. We should aim to replace this with a socket-
based transport instead.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-02-15 15:10:20 +00:00
Justin Cormack
2d140e7d18 Merge pull request #26 from dsheets/transfused 
Transfused
 2016-02-12 17:30:43 -08:00
Justin Cormack
d98db48c4d bump aufs commit 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-12 17:03:16 -08:00
Justin Cormack
053f1cba68 update kernel to 4.1.17 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-12 17:02:28 -08:00
David Sheets
b36faade61 transfused: if the pidfile exists, make sure to truncate it 2016-02-12 14:08:11 +00:00
David Sheets
321ee6b30f transfused: it is ok if the pidfile does not yet exist 2016-02-12 14:08:11 +00:00
David Sheets
c213b59a3a transfused: init with a pidfile 2016-02-12 14:08:11 +00:00
David Sheets
f4207db176 transfused: fix the 9p socket root name 2016-02-12 14:08:10 +00:00
David Sheets
4ee04ecd45 transfused: introduce command line arguments for pidfile, fusermount, 9p 2016-02-12 14:08:10 +00:00
David Sheets
396e180adb transfused: improve some error message output and fix an fd mixup 2016-02-12 14:08:10 +00:00
David Sheets
7e21a29055 transfused: add trace logging error checking 2016-02-12 14:08:10 +00:00
David Sheets
4f0ca1c4ee transfused: do not check return of close 
on advice from @justincormack
 2016-02-12 14:08:10 +00:00
David Sheets
9150a6f455 transfused: hook debug into HUP-toggled run-time debug system 2016-02-12 14:08:10 +00:00
David Sheets
f62e78ad86 transfused: clean up equal sign spacing 2016-02-12 14:08:10 +00:00
David Sheets
7ef2c29d50 transfused: clean up comma spacing 2016-02-12 14:08:10 +00:00
David Sheets
a04b701bc6 transfused: use an absolute path for fusermount 
Gets rid of non-portable execvpe for execve and prevents diversion.
Explicit diversion will be introduced as a command-line option later.
 2016-02-12 14:08:10 +00:00
David Sheets
33019eeb34 transfused: address @yallop's comments 2016-02-12 14:08:10 +00:00
David Sheets
a3562b50a8 9pudfuse: remove in favor of transfused 2016-02-12 14:08:09 +00:00
David Sheets
d0d28778f6 transfused: fix .gitignore 2016-02-12 14:07:43 +00:00
David Sheets
726650a126 Replace 9pudfuse with transfused 2016-02-12 14:07:43 +00:00
David Sheets
7dfba256d8 Add a FUSE proxy written in C 
This should improve portability, be more palatable for future
distribution, and enable lower-level control. Addresses #8.
 2016-02-12 14:07:43 +00:00
Dave Scott
f28efb4ea9 Merge pull request #28 from djs55/9pudc 
9pudc: add `defer conn.Close()` for the connection to docker
 2016-02-12 11:04:04 +00:00
David Scott
0affdd986d 9pudc: add defer conn.Close() for the connection to docker 
Before this patch we were using `conn.CloseRead()` and `conn.CloseWrite()`
to flush and signal EOF properly in the proxy, but we forgot to actually
close the file descriptor. As a result we leaked one fd per request,
until the GC came along and closed them for us. This could explain why
the process appeared to block: new connections could not be accepted
because we were out of fds, but once the GC had happened (or we closed
some 9P fds as a result of the client on the host closing its connection)
then the process would unwedge.

This doesn't explain why the 9P filesystem itself would occasionally become
unresponsive in Linux, although apparently still processing requests normally
if you connect to it directly over the host-side socket.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-02-12 10:40:01 +00:00
Justin Cormack
b2871c2528 upgrade docker to 1.10.1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-11 13:58:50 -08:00
Justin Cormack
0afaff2c4a Add some wrappers to support at least the default uid mapping 
The busybox adduser and addgroup commands are ignored by docker,
as it avoids symlinks, but they are not compatible so this is
kind of a good idea.

See https://github.com/docker/docker/blob/master/pkg/idtools/usergroupadd_linux.go

However, these do not yet deal with creating mapping ranges in /etc/subuid and
/etc/subgid, so initially we provide a set that match the default docker name
so at least docker daemon --userns-remap=default should work.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-10 15:47:37 -08:00
Justin Cormack
4564a44b8d remove temporary containers 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-10 14:31:37 -08:00
Justin Cormack
b477fae0cd Merge pull request #25 from dsheets/socket-msize 
Improve docker socket I/O by 30-70% each way
 2016-02-09 10:18:04 -08:00
David Sheets
d545614ea1 Improve docker socket I/O by 30-70% each way 
Upload into a container was 10MiB/s now 17MiB/s.
Download from a container was 16MiB/s now 21MiB/s.
 2016-02-09 18:12:17 +00:00
Justin Cormack
34e83591e5 Merge pull request #24 from dsheets/9p-msize 
In conjunction with mirage/ocaml-9p#58, speeds up seq read 13x + seq write 11x
 2016-02-09 09:42:50 -08:00
David Sheets
c680e40bbe In conjunction with mirage/ocaml-9p#58, speeds up seq read 13x + seq write 11x 2016-02-09 17:40:56 +00:00
Justin Cormack
48fba08878 fix 9pudc startup 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-08 18:30:30 -08:00
Justin Cormack
f0fa9db182 logging for 9pudc 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-08 15:22:10 -08:00
Justin Cormack
fd50baab2f Merge pull request #23 from rneugeba/win-cleanup 
Win cleanup
 2016-02-05 17:04:22 -08:00
Rolf Neugebauer
53dcbaf52a win: remove PS script and documentation. They live elsewhere now 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-02-05 16:58:59 -08:00
Rolf Neugebauer
59f25b9c71 dnsfix: don't run it in a Hyper-V VM 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-02-05 16:57:47 -08:00