Commit Graph

479 Commits

Author SHA1 Message Date
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
Justin Cormack
a15f580d78 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
89a2e5fa45 vsudd: Enable timestamps on logging
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-04-05 14:16:19 +01:00
Justin Cormack
46f987735e 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
af65a76cf3 highlight failed downloads
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-05 14:02:06 +01:00
Ian Campbell
be7a9a4cda 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
4b1936db47 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
778b82a0de 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
2bfd4e62c8 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
2e70f27c79 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
3d7da9df67 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
a887fb110c 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
f065ec7fdb 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
22464eae51 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
2668e441d5 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
09a98bf3e2 remove 9pudc, unused and not being fixed
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-04 18:21:01 +01:00