github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-25 07:30:50 +00:00
Code Issues Projects Releases Wiki Activity
725 Commits 1 Branch 32 Tags
95291e9733de4f29abac5f3658f0d4f165979f3d
Commit Graph

102 Commits

Author SHA1 Message Date
Justin Cormack
76d71e035d Move to 3.4 repositories, openrc 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-08 12:45:07 +01:00
Justin Cormack
e434c70507 Update to Alpine 3.4 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-03 12:45:15 +01:00
Dave Tucker
66372fe5e8 Remove hupper and mobyconfig watch 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-06-02 20:39:25 +01:00
Nathan LeClaire
810d50aef0 Add 'bootflag' script to check kernel flags 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-06-01 15:30:53 -07:00
David Scott
980588b68f proxy: add a multiplexing server frontend 
On a Hyper-V system we can only register one listening endpoint (with
a GUID), so we need to accept connections, read a header and then
start the proxy.

If the binary has argv[0] == "proxy-vsockd" then run this new frontend.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-22 12:43:18 +01:00
David Scott
da954e93e3 tap-vsockd: add tap-vsockd service to bring up eth1 
The tap-vsockd service is started from eth1's pre-up script.

On the Mac: the bind of the AF_HYPERV socket fails, and eth1 is skipped.
On Windows: if there is no database then eth1 is skipped.
On Windows: if the database has network=native then eth1 is brought up.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-21 21:58:38 +01:00
Dave Scott
49ca65ede8 Merge pull request #145 from djs55/tap-vsockd-tool 
tuntap vsock tool
 2016-05-21 13:50:03 -07:00
David Scott
af556bdc23 9pmount-vsock: add to /sbin 
This patch adds the binary to /sbin but does not hook it up.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-21 21:41:50 +01:00
David Scott
d7863c8882 tap-vsockd: add to /sbin 
Install the daemon in /sbin, but don't start it up yet.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-21 21:15:11 +01:00
Rolf Neugebauer
49d72c048a moby: revert #126. setup-disk -m depends on syslinux for now 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-20 09:42:46 +01:00
Justin Cormack
259224176f We do not seem to need syslinux in the image, and it brings in libpng and things we do not need 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-11 14:56:58 +01:00
Justin Cormack
952bb2d3db Revert "replace chronyd with sntpc, sync every 15s not 15m" 
We should not use ntp.org this frequently, need to work out something
that uses host time mainly.

This reverts commit 382f99529d.
 2016-05-10 11:29:16 +01:00
Justin Cormack
32ddaae7a5 replace chronyd with sntpc, sync every 15s not 15m 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-10 11:00:51 +01:00
Justin Cormack
7ec5e0b741 add resize2fs to build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-27 12:10:23 +01:00
Justin Cormack
281d6a21de add oom killer config, so containers die before system daemons, fix #110 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-26 16:00:36 +01:00
Justin Cormack
c470c2f0fa remove mdnstool now we are only using hostnet 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-26 14:45:50 +01:00
Justin Cormack
8a4b9a7819 Switch from busybox mdev to kernel devtmpfs 
This is simpler, and as a by-product should resolve
https://github.com/docker/pinata/issues/1968
as it uses the now-more-correct loop device names
that newer util-linux expects.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-25 12:03:32 +01:00
Justin Cormack
418a7ba4ab clean up apk cache after install to make image a little smaller 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-25 10:59:36 +01:00
Ian Campbell
cf491f05cc Stop including nc-vsock in the initrd 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-04-21 10:09:34 +01:00
Justin Cormack
18745f6b76 fix arm build see #101 #96 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-18 11:34:14 +01:00
Rolf Neugebauer
3ddc98d1b6 moby: add a cut-down version of gummiboot 
The gummiboot EFI stub is used for creting a EFI bootable ISO

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-04-16 12:50:37 +01:00
Justin Cormack
115373d42e Merge pull request #92 from djs55/go-diagnostics 
moby: rewrite diagnostics server in Go
 2016-04-15 16:17:08 +01:00
David Scott
4802911c8f moby: rewrite diagnostics server in Go 
This will make it easier to add a vsock interface as well as a regular
TCP/IP one.

As a side-effect, the server is now able to handle more than one concurrent
request!

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-15 16:09:54 +01:00
Rolf Neugebauer
fba8a986b9 alpine: create source tarballs for hvtools and llmnrd 
Add them to the initrd under /usr/share/src

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-04-15 15:10:29 +01:00
Rolf Neugebauer
32c999a02f chronyd: don't start it when running on Hyper-V 
This is a bit ugly as we copied and then modified the chronyd init.d
script as shipped in the package.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-04-15 15:10:28 +01:00
Rolf Neugebauer
b3a82885ba hvtools: tweak startup sequence 
- Don't start hv_fcopy_daemon. It seems to exit and we are not
  using it anyway. Also, remove it from the initrd

- Move hv_kvp_daemon and hv_vss_daemon to start earlier
  (before networking and docker being started)

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-04-15 15:10:28 +01:00
Rolf Neugebauer
73a0d1671e kernel,initrd: add CIFS to the kernel and cifs-utils to the initrd 
Needed to enable SMB/CIFS mounts on Windows hosts

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-04-15 14:51:27 +01:00
Rolf Neugebauer
bcf2cd851d llmnrd: Add a LLMNR Daemon 
LLMNR is the Windows equivalent of mDNS.

Import the LLMNR daemon from https://github.com/tklauser/llmnrd
It needed some small modification to compile cleanly on Moby

LLMNRD is only started when running inside a Hyper-V VM

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-04-15 14:51:10 +01:00
Dave Tucker
c5cbb9aaa2 Add util-linux for K8's 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-04-14 18:27:00 +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
aa0fd62747 rename database to hostsettings 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 15:11:20 +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
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
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
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
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
David Scott
4ce4e978c6 Add skeleton /sbin/proxy program 
This will eventually contain the `docker-proxy` replacement.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-04 12:41:02 +01:00
Justin Cormack
85fa14ad8e Remove docker-x for now as no longer working, and was not possible to enable. Will rework when strategy for supporting multiple dockers decided 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-04 11:47:48 +01:00
Justin Cormack
d29278ba32 clean up unpacking docker rc3 bundle 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-03 09:34:01 +01:00
Justin Cormack
a187d2e5f4 Support for 1.11.0-rc2, fix #57 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-31 18:54:05 +01:00
Justin Cormack
3473f0717f Merge pull request #59 from djs55/diagnostics-server 
Allow diagnostics to be downloaded on port 62374
 2016-03-31 12:16:00 +01:00
David Scott
af9b3ad7a2 Allow diagnostics to be downloaded on port 62374 
A client like `pinata diagnose` can do the equivalent of:

  nc 192.168.64.2 62374 > foo.tar

and find `foo.tar` contains

- the output of `/usr/bin/diagnostics`
- `iptables -L`
- `netstat -an`
- `ps uax`
- `docker ps`
- `dig docker.com`
- `wget http://docker.com`

This will allow us to diagnose various in-VM faults, without having
to ask the user to access the console and run commands.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-03-30 10:31:55 +01:00
Justin Cormack
4dec575407 switch root to a tmpfs filesystem, so pivot_root works, should make #57 work now 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-29 22:09:23 +01:00
Justin Cormack
cbd7af5e1d store source info for kernel and kernel patches in image for #45 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-18 13:53:26 +00:00
Justin Cormack
407eba8daa move hostlog into 9pinit so it happens early enough to capture logs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 12:27:20 +00:00
Justin Cormack
729faed1d4 exact commit for alpine to help match source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-10 20:41:28 +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
David Sheets
192c90b0a7 Replace 9pudfuse with transfused 2016-02-12 14:07:43 +00:00