Commit Graph

7238 Commits

Author SHA1 Message Date
Justin Cormack
4980c1a80e typo
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-17 14:11:13 +00:00
Justin Cormack
41c1689ab4 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
4945353da3 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
a049d233d2 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
5da9891c8b 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
1d2e9cacb0 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
c1797c304c 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
2b959f22c6 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
9c5470ca87 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
b891c52525 Merge pull request #26 from dsheets/transfused
Transfused
2016-02-12 17:30:43 -08:00
Justin Cormack
e9bd1ad9cd bump aufs commit
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-12 17:03:16 -08:00
Justin Cormack
0008577f78 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
b1d3101846 transfused: if the pidfile exists, make sure to truncate it 2016-02-12 14:08:11 +00:00
David Sheets
cbd5ca5991 transfused: it is ok if the pidfile does not yet exist 2016-02-12 14:08:11 +00:00
David Sheets
eb199ca9d7 transfused: init with a pidfile 2016-02-12 14:08:11 +00:00
David Sheets
7f088f9008 transfused: fix the 9p socket root name 2016-02-12 14:08:10 +00:00
David Sheets
94c3143c76 transfused: introduce command line arguments for pidfile, fusermount, 9p 2016-02-12 14:08:10 +00:00
David Sheets
d69b402584 transfused: improve some error message output and fix an fd mixup 2016-02-12 14:08:10 +00:00
David Sheets
c830c22335 transfused: add trace logging error checking 2016-02-12 14:08:10 +00:00
David Sheets
71fa8711ec transfused: do not check return of close
on advice from @justincormack
2016-02-12 14:08:10 +00:00
David Sheets
fee789baf1 transfused: hook debug into HUP-toggled run-time debug system 2016-02-12 14:08:10 +00:00
David Sheets
2fec071a41 transfused: clean up equal sign spacing 2016-02-12 14:08:10 +00:00
David Sheets
f949e737e8 transfused: clean up comma spacing 2016-02-12 14:08:10 +00:00
David Sheets
c8b9013ed3 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
7ab2f3816c transfused: address @yallop's comments 2016-02-12 14:08:10 +00:00
David Sheets
1efc36a38c 9pudfuse: remove in favor of transfused 2016-02-12 14:08:09 +00:00
David Sheets
6384fbe0dc transfused: fix .gitignore 2016-02-12 14:07:43 +00:00
David Sheets
192c90b0a7 Replace 9pudfuse with transfused 2016-02-12 14:07:43 +00:00
David Sheets
9a9e35b4ba 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
ac4b3e9893 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
8805c3c711 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
8720e79afa 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
8cc82ba98b 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
6ee7b22152 remove temporary containers
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-10 14:31:37 -08:00
Justin Cormack
b08e5baddd 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
7197f35b5e 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
0167549645 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
03ad9781ad 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
1f9bf7c321 fix 9pudc startup
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-08 18:30:30 -08:00
Justin Cormack
fd8ac2fb83 logging for 9pudc
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-08 15:22:10 -08:00
Justin Cormack
31cf8d0c0d Merge pull request #23 from rneugeba/win-cleanup
Win cleanup
2016-02-05 17:04:22 -08:00
Rolf Neugebauer
b037de72b1 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
4189cffeee 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
Rolf Neugebauer
68af3a7c22 hvtools: Force down the interface is config changes
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 16:57:47 -08:00
Rolf Neugebauer
7f7abf722e docker: also listen to local unix socket when running on Hyper-V
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 16:57:47 -08:00
Rolf Neugebauer
ad95c77f90 hvtools: fix script to configure the IP address from the host
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 16:57:47 -08:00
Rolf Neugebauer
8d96529820 mdnstool: don't start when running as a Hyper-V VM
Windows doesn't grok mDNS by default. No need to start mdnstool

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-02-05 15:49:02 -08:00
Michel Courtine
4805f56846 added the -force switch to silence the powershell unrestricted access request 2016-02-05 14:33:06 -08:00
Justin Cormack
e9dc319b85 update to docker 1.10.0
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-04 12:03:05 -08:00
Justin Cormack
2faff22893 Merge pull request #22 from dsheets/fix-docker-log
Fix the docker.log output filename
2016-02-04 07:05:52 -08:00