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
Justin Cormack
aac92e525c
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
99fb50d89f
update to -rc4
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-07 09:55:57 +01:00
Justin Cormack
f4d5a1c14e
Merge pull request #69 from ijc25/vsock
...
Add frontend support for virtio-vsock
2016-04-06 15:55:41 +01:00
Justin Cormack
a8d4ffe20d
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
4bb0da581f
remove more kexec code
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-06 10:28:15 +01:00
Justin Cormack
cdeec45d66
remove experimental kexec code, now in branch elsewhere
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-06 10:27:29 +01:00
Ian Campbell
dd237901ea
vsudd: Enable timestamps on logging
...
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 14:16:19 +01:00
Justin Cormack
8c415a0b2f
work around more license formatting issues
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-05 14:16:13 +01:00
Justin Cormack
957746875d
highlight failed downloads
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-05 14:02:06 +01:00
Ian Campbell
eac9d655c6
vsudd: New daemon to proxy vsock to Unix domain sock
...
Used to proxy vsock 2376 <-> /var/run/docker.sock in the Moby VM.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 13:50:06 +01:00
Ian Campbell
c2546d2319
nc-vsock: Add unidirecitonal read/write modes
...
-r == read from the vsock
-w == write to the vsock
This makes it easier to write automated test cases.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 13:40:41 +01:00
Ian Campbell
f9825fbafd
nc-vsock: shutdown output socket on input EOF
...
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 13:40:41 +01:00
Ian Campbell
a9784a5fe0
nc-vsock: Keep going until both fds read EOF.
...
Rather than exiting when the first read hits EOF, ignoring any remaining data
going the other way.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 13:40:41 +01:00
Ian Campbell
ce5c85f7c1
nc-vsock: output to stdout rather than stdin
...
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 13:40:41 +01:00
Ian Campbell
8fdebc091c
nc-vsock: Use a 256K buffer
...
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 13:40:41 +01:00
Ian Campbell
eb221b4d4f
Add VSOCK patches
...
These are WIP taken from git@github.com:stefanha/linux.git#vsock
(==4c9d2a6be1c6, using "cherry-pick -x") and correspond to RFC v5 of the
frontend patches posted in
http://thread.gmane.org/gmane.linux.kernel.virtualization/27455
There is no corresponding spec proposal update yet, but this set of patches
correspond (roughly) to addressing the feedback on v4 of the spec proposal
http://thread.gmane.org/gmane.comp.emulators.virtio.devel/1062 .
kernel_config.arm modifications copied from x86, not tested.
Added /etc/kernel-patches/ directory to the image to be consumed by the
licensing.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 13:40:36 +01:00
Ian Campbell
4651a150f8
Add nc-vsock utility (for testing AF_VSOCK)
...
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 13:39:44 +01:00
Justin Cormack
ae084196bc
fix licensing container to fix #70
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-05 12:40:26 +01:00
Justin Cormack
8a8045e03d
remove 9p mounts for lofs and sockets
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-05 11:22:39 +01:00
Justin Cormack
6b0b4e05cb
remove 9pudc, unused and not being fixed
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-04 18:21:01 +01:00
Justin Cormack
7d11cd267b
Do not pin alpine 3.3 version, we do apk upgrade anyway
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-04 15:56:51 +01:00
Justin Cormack
1956a5485a
Merge pull request #66 from djs55/docker-proxy-ports
...
Add custom docker-proxy which understands host port forwarding
2016-04-04 16:32:11 +02:00
Justin Cormack
2d4e77a851
Merge pull request #68 from justincormack/linux4.4
...
update to 4.4.6 stable kernel series
2016-04-04 15:13:09 +02:00