github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-17 09:44:21 +00:00
Code Issues Projects Releases Wiki Activity
357 Commits 1 Branch 31 Tags
471833fae72e3ebc42b4bd8bcb18d613b956951f
Commit Graph

173 Commits

Author SHA1 Message Date
David Sheets
471833fae7 transfused: work-around virtio-9p/v9fs zero-copy bug 
Signed-off-by: David Sheets <david.sheets@docker.com>
 2016-03-20 11:03:24 +00:00
Justin Cormack
23458ff37f Merge pull request #48 from dsheets/transfused-events 
transfused: change protocol to support events, add syslog logging
 2016-03-18 11:42:48 +00:00
David Sheets
16101e66c3 transfused: add start-up log, self-log trigger, and run-time log flags 
During start-up, logs are sent to syslog and stderr and the console if
syslog is not available. -l logfile will also send the logs to logfile but
only prior to any log trigger events. -m mount_trigger lets the user
specify the mount point to watch for to begin sending logs to
-t triggered_log file which may be on the newly mounted file system. Log
concatenation and rollover are not implemented, yet. Logging functionality
has been separated into transfused_log.c. Locks have been placed around
shared fds. The writer thread is now symmetric to the reader thread instead
of inheriting the parent's thread in order to trigger log switchover after
the file system proxy has started. The coredump size rlimit has been lifted.

Signed-off-by: David Sheets <david.sheets@docker.com>
 2016-03-18 11:21:42 +00:00
Justin Cormack
43de87bed7 clean up log transfer 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-18 11:20:28 +00:00
David Sheets
58ded96b29 transfused: fix usage msg, remove syslog, use start-stop-daemon logging 
Signed-off-by: David Sheets <david.sheets@docker.com>
 2016-03-18 09:33:41 +00:00
David Sheets
224bbcea63 transfused: change protocol to support events, add syslog logging 
The event string in the 9p socket file system now contains a 1 byte
channel type immediately preceding the connection ID. This channel type
determines which protocol will be used on the channel -- m for FUSE
protocol, e for events. The event messages are host-initiated and have
the following structure:

  2 bytes for total length
  2 bytes for path length + NUL (x)
  x bytes for path
  1 byte  for syscall

stderr logging was also changed to syslog-based logging in this patch.

Signed-off-by: David Sheets <david.sheets@docker.com>
 2016-03-18 09:33:41 +00:00
Justin Cormack
f0ff62fbe2 fix typo properly 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 19:47:14 +00:00
Justin Cormack
c18749b761 typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 18:27:42 +00:00
Justin Cormack
65c187a0dd shift logs to host before docker startup, keep old logs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 15:27:50 +00:00
Justin Cormack
6178bb2221 too early to log here, fuse not up 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 14:49:35 +00:00
Justin Cormack
c22d1f36a6 add log message for starting docker 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 14:28:55 +00:00
Justin Cormack
b4560d8876 fix typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 14:06:39 +00:00
Justin Cormack
8c49b54738 make sure transfused is logging 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 12:30:18 +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
c8b351bda4 docker download needs Linux not linux, sigh 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-15 16:00:28 +00:00
Justin Cormack
7bc1c77482 clean up download to make sure errors correctly 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-15 15:45:43 +00:00
Justin Cormack
74aa597409 revert to 32k transfers for next beta 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-15 15:20:56 +00:00
Justin Cormack
18ad2f95e9 also set OS for arm builds 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-14 20:00:39 +00:00
Justin Cormack
7000440afd explicitly set OS=linux as Windows sets OS env var 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-14 19:57:15 +00:00
Justin Cormack
5aac58d322 256k transfers working now on pinata 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-14 15:26:48 +00:00
Justin Cormack
6efb24b599 revert max 9p transfer size to 64k 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-14 14:41:56 +00:00
Justin Cormack
263bb8030d increase max 9p transfer size to 256k 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-14 13:57:28 +00:00
Justin Cormack
5d6f234057 fix docker pidfile, may resolve #44 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-11 11:52:24 +00:00
Justin Cormack
ae984a50a1 update to docker 1.10.3 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-10 22:08:48 +00:00
Justin Cormack
3033747de6 move ntp cron job to correct directory, fix timekeeping drift better 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-10 11:15:01 +00:00
Justin Cormack
e003a56326 clean up docker init 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-04 11:50:28 +00:00
Justin Cormack
e9216cc716 Do not write ip address to database, no longer needed. 
See discussion in #39.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-04 10:43:01 +00:00
Justin Cormack
c9ba063c7d somehow networking is resetting hostname, get mdnstool to fix for now 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-01 16:50:30 +00:00
David Scott
076fcce176 Add debugging around writing the "ip" file 
If writing the "ip" file doesn't happen, this should show the reason
why.

Related to #39

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-03-01 09:21:28 +00:00
Justin Cormack
928667ca57 clean up transfused startup scripts 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-26 13:46:26 +00:00
Justin Cormack
5dd093656f Revert "set debug mode on docker daemon" 
This reverts commit 52cce5311a.
 2016-02-24 16:18:47 +00:00
Justin Cormack
12389cd8cc set debug mode on docker daemon 
See https://github.com/docker/pinata/issues/827

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-24 14:24:58 +00:00
Justin Cormack
d0ec243663 update to 1.10.2 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-22 23:25:06 +00:00
Justin Cormack
d1081e6b6e output that we are shutting down docker 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-19 16:59:38 +00:00
Justin Cormack
42e85b9776 Merge pull request #36 from dave-tucker/dtb 
Clean up ARM builds
 2016-02-19 15:15:27 +00:00
Dave Tucker
2b5b1e64fa Clean up ARM builds 
- Check in dtbs and give them their own directory
- Add cubieboard dtbs :)
- Remove hyper-v tools from arm Dockerfile

Signed-off-by: Dave Tucker <dt@docker.com>
 2016-02-19 14:59:55 +00:00
Justin Cormack
f0afaf3074 #35 somewhat hacky patch for fast shutdown, just sync filesystems and halt after docker shutdown 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-19 14:53:23 +00:00
Justin Cormack
d054f4392d use driverDir not groupDir 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-18 11:19:52 +00:00
Dave Tucker
c26bfdc275 Fix ARM Builds 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-02-17 17:59:21 +00:00
Dave Scott
fe94f5992a Merge pull request #31 from djs55/remove-driverDir 
Remove driverDir, use groupDir
 2016-02-17 15:52:21 +00:00
Justin Cormack
e2659a8131 remove bind mounts from 9pinit 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 14:22:55 +00:00
Justin Cormack
d23dada888 bind mount at docker start 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 14:17:40 +00:00
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
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
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
David Sheets
b1d3101846 transfused: if the pidfile exists, make sure to truncate it 2016-02-12 14:08:11 +00:00