Commit Graph

391 Commits

Author SHA1 Message Date
Justin Cormack
5057a0cc54 update to docker 1.11.0-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-02 09:12:20 +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
1947dc4e19 check diagnostics server running in diagnostics
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-31 14:58:13 +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
1beef9a6c8 diagnose: include iptables -t nat -L
The extra `-t nat` includes the masquerading stuff.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-03-31 11:14:31 +01:00
David Scott
157d2aef07 diagnostics: use netstat -tulpn which includes process names
For example:

  docker:~# netstat -tulpn
  Active Internet connections (only servers)
  Proto Recv-Q Send-Q Local Address           Foreign Address         State       PID/Program name
  tcp        0      0 :::32768                :::*                    LISTEN      1344/docker-proxy
  tcp        0      0 :::2375                 :::*                    LISTEN      1124/docker
  tcp        0      0 :::5000                 :::*                    LISTEN      1444/docker-proxy
  tcp        0      0 :::5001                 :::*                    LISTEN      1494/docker-proxy

Signed-off-by: David Scott <dave.scott@docker.com>
2016-03-31 10:35:35 +01:00
Justin Cormack
7d13618c2c update to 4.1.20
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-30 17:02:22 +01:00
David Scott
82e9dfc4ee diagnose: grab the tail /var/log/docker.log
Signed-off-by: David Scott <dave.scott@docker.com>
2016-03-30 15:42:48 +01:00
Justin Cormack
b42ce503b8 simplified vendoring
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-30 15:08:32 +01:00
David Scott
f9eca40371 diagnose: put all the files inside a moby/ subdirectory
Signed-off-by: David Scott <dave@recoil.org>
2016-03-30 15:03:28 +01:00
David Scott
d24dd9d59b diagnose: ls -l /var, /var/lib and /var/lib/docker
Signed-off-by: David Scott <dave.scott@docker.com>
2016-03-30 14:28:00 +01:00
David Scott
a97038273e diagnose: try a ping, grab /etc/resolv.conf and route -n
Signed-off-by: David Scott <dave.scott@docker.com>
2016-03-30 14:25:58 +01:00
David Scott
75f60eca3c diagnostics-server: add more diagnostics
For networking:
- ifconfig -a
- brctl show

For storage:
- mount
- df

Signed-off-by: David Scott <dave@recoil.org>
2016-03-30 10:34:04 +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
38aef85f6a fix some pedantic xhyve build issues with newer toolchain
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-29 18:46:20 +01:00
Justin Cormack
f98fb92480 add --rm for transfused
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-29 18:31:55 +01:00
Justin Cormack
6f9f612cad Merge pull request #58 from yallop/free-con
Transfused: free connection objects when read returns 0.
2016-03-29 16:54:13 +01:00
Jeremy Yallop
f23b6d7596 Transfused: free connection objects when read returns 0. 2016-03-29 16:37:51 +01:00
Justin Cormack
dfeda82352 No need to add git to golang:alpine now we have vendored all code
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-28 22:12:51 +01:00
Justin Cormack
dc5258eeed use build-base not alpine-sdk as smaller and we do not need rest
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-28 18:18:48 +01:00
Justin Cormack
a762abd045 remove all uses of go get as everything vendored in #56
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-23 12:24:21 +00:00
Justin Cormack
4d843f8281 fix #56 by vendoring mdns libraries
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-23 12:19:01 +00:00
Justin Cormack
6943aa001e add make vendor for #56
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-23 12:18:19 +00:00
Justin Cormack
02fe82a79f add Makefile for licensing container
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-22 11:58:16 +00:00
Justin Cormack
dfd70a1d1d include all source not just GPL
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-22 11:23:55 +00:00
Justin Cormack
e734661558 include aufs in GPL download container
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-21 11:51:08 +00:00
Justin Cormack
77a4671196 add kernel source, fix subpackages
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-21 11:31:48 +00:00
David Sheets
35215103f1 Merge pull request #55 from dsheets/transfused-events
transfused: add chmod event syscall
2016-03-20 22:02:47 +00:00
David Sheets
a3b644ca5d transfused: add chmod event syscall
Signed-off-by: David Sheets <dsheets@docker.com>
2016-03-20 22:01:22 +00:00
David Sheets
89ccf55ca8 Merge pull request #54 from dsheets/transfused-events
transfused: work-around 9p bug, fix logging bugs
2016-03-20 12:26:19 +00:00
David Sheets
c0b857c7bb transfused: create threads already detached
Signed-off-by: David Sheets <david.sheets@docker.com>
2016-03-20 11:20:00 +00:00
David Sheets
72157cf5ee transfused: move logging off of the event actuation thread
Signed-off-by: David Sheets <david.sheets@docker.com>
2016-03-20 11:08:57 +00:00
David Sheets
725329983a transfused: fix run-time log non-append bug
Signed-off-by: David Sheets <david.sheets@docker.com>
2016-03-20 11:04:01 +00:00
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
3907ec30b1 initial program to extract GPL source from running Moby for #45
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-18 15:19:56 +00: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
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