Commit Graph

831 Commits

Author SHA1 Message Date
David Sheets
fbcba85f0e transfused: distinguish export requests from mount requests
We distinguish export suitability requests from bind mount suitability
requests in the transfuse control protocol. This distinction allows us to
permit both bind mounts of empty directories and export mounts onto empty
directories. Addresses docker/pinata#4213.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-04 18:53:05 -07:00
Justin Cormack
bc4e41cc80 Merge pull request #249 from justincormack/nomodules
Updated kernel config
2016-07-05 01:19:38 +01:00
Justin Cormack
cdad79e916 Updated kernel config
Remove one module, Xen ones not removeable. Make oldconfig.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-04 17:03:10 +01:00
Justin Cormack
6ad074f65b Merge pull request #246 from ijc25/populate-lib-modules
Populate /lib/modules/`uname -r`
2016-07-04 15:48:53 +01:00
Justin Cormack
683f627e9a Merge pull request #247 from justincormack/ulimit
use cat not sysctl for reading sysctl values
2016-07-04 15:48:20 +01:00
Justin Cormack
18b933e81b use cat not sysctl for reading sysctl values
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-04 15:47:46 +01:00
Ian Campbell
209dd754bc Populate /lib/modules/uname -r
This is less to do with installing modules (which we generally don't expect to
use in Moby) but to populate /lib/modules/`uname -r`/modules.builtin which
turns:

    moby:~# modprobe ip_vs
    modprobe: FATAL: Module ip_vs not found in directory /lib/modules/4.4.14-moby
    moby:~# modprobe nf_nat
    modprobe: FATAL: Module nf_nat not found in directory /lib/modules/4.4.14-moby
    moby:~#

into:

    moby:~# modprobe ip_vs
    moby:~# modprobe nf_nat
    moby:~#

which reduces the amount noise in the logs, e.g. in docker.log:

time="2016-07-04T11:21:58Z" level=warning msg="Running modprobe nf_nat failed with message: `modprobe: WARNING: Module nf_nat not found in directory /lib/modules/4.4.14-moby`, error: exit status 1"

A fair number of these appear in the logs.

This also stops various tools logging about /lib/modules/`uname -r` not
existing (there was one in the boot log until recently I think)

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-07-04 15:44:48 +01:00
Justin Cormack
c86c6d1c59 Merge pull request #245 from justincormack/ulimit
Increase ulimits as high as possible
2016-07-04 14:45:38 +01:00
Justin Cormack
265ed43f21 Increase ulimits as high as possible
Setting unlimited improves performance.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-04 14:37:28 +01:00
Justin Cormack
514bbcf717 Merge pull request #237 from ijc25/diagnostics
Fixup diagnostics logging
2016-07-04 11:13:42 +01:00
Justin Cormack
994f2c965a Merge pull request #243 from djs55/docker.1.12-rc3
Update docker to 1.12.0-rc3
2016-07-04 11:10:38 +01:00
Justin Cormack
5814059098 Merge pull request #240 from dsheets/remove-fixed-export-mounts
docker init: remove fixed host export mounts
2016-07-04 11:10:17 +01:00
David Scott
269d61a849 Update docker to 1.12.0-rc3
Signed-off-by: David Scott <dave.scott@docker.com>
2016-07-04 11:04:29 +01:00
David Sheets
9d3e8ad516 docker init: remove fixed host export mounts
Signed-off-by: David Sheets <dsheets@docker.com>
(cherry picked from commit 760840ac69)
2016-07-02 12:27:09 -07:00
Ian Campbell
110bdd831b diagnostics: Only log connection failure if not EAFNOTSUPPORT
EAFNOTSUPPORT likely means we are running on a hypervisor which doesn't support
that particular socket type.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-07-01 15:35:27 +01:00
Ian Campbell
dde4ab70ba diagnostics: Log over syslog
Instead of spamming the console.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-07-01 15:35:27 +01:00
Ian Campbell
a329bbc8e0 diagnostics: Correct error formatting
They should be formatted as %s not %#v (which prints all sorts of opaque
pointers).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-07-01 15:35:26 +01:00
Ian Campbell
f2b432053c diagnostics: run "gofmt -w" over go code
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-07-01 15:35:26 +01:00
Justin Cormack
8b99d0c026 Merge pull request #228 from justincormack/kernelup
update linux to 4.4.14 and update aufs to 20160627
2016-06-26 16:17:48 -07:00
Justin Cormack
1d22f68e87 update linux to 4.4.14 and update aufs to 20160627
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-26 16:16:57 -07:00
Rolf Neugebauer
144c643c05 Merge pull request #227 from rneugeba/diag-improv
diag: improve diagnostics
2016-06-22 11:58:42 +01:00
Rolf Neugebauer
72fd755473 diag: improve diagnostics
- try several wget's on well known IP addresses to check IP
  connectivity (ping in hostnet mode is not good enough)
- try DNS lookup on a well known server
- add service-port-opener logs

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-06-22 11:38:51 +01:00
Justin Cormack
35669c7a29 Merge pull request #226 from rneugeba/kvp-earlier
win: ensure that the KVP daemon starts early
2016-06-21 15:46:53 -07:00
Rolf Neugebauer
082c10d997 win: ensure that the KVP daemon starts early
The Windows start script polls the VM for it's IP address before
initiating things like CIFS mounts.  Getting the IP config is
done via the KVP daemon.  Starting it earlier reduce the start up
delay, in particular if the VM is part of a swarm.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-06-21 14:19:59 +01:00
Justin Cormack
e130ef839e Merge pull request #223 from justincormack/qemufix
Make the qemu containers interactive so the console works
2016-06-19 17:00:17 +01:00
Justin Cormack
8777d775ed Make the qemu containers interactive so the console works
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-18 21:47:31 +01:00
Justin Cormack
74a7622ee3 Merge pull request #220 from dhiltgen/console
Add SATA disk support
2016-06-17 16:16:46 +01:00
Daniel Hiltgen
3479c8b3ac Add SATA disk support
Increase the number of hypervisors where Moby can run and detect
the disks.  With this change, I'm able to boot under KVM and see
the disk detected, formatted and mounted as expected.
2016-06-17 08:11:46 -07:00
Justin Cormack
2d67ea5cb8 Merge pull request #218 from ijc25/mkdir-p
Use "mkdir -p /run/log" in docker initfile
2016-06-17 14:03:14 +01:00
Justin Cormack
ff82e8fc89 Merge pull request #217 from ijc25/bashisms
Avoid brace expansion which is a bashism.
2016-06-17 14:02:57 +01:00
Ian Campbell
013599c78f Use "mkdir -p /run/log" in docker initfile
For the "no error if existing" rather than "make parents" affect. Otherwise:

moby:~# service docker restart
 * Stopping docker
 * Starting Docker ...
mkdir: can't create directory '/run/log': File exists
 [ ok ]

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-06-17 13:57:33 +01:00
Ian Campbell
9cc8e4a106 Avoid brace expansion which is a bashism.
Building on Debian where /bin/sh is dash:

make[1]: Leaving directory '/home/ijc/development/Docker/moby.git/alpine/packages/docker/docker.git'
mkdir -p bin
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/
cp: cannot stat 'docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc}': No such file or directory
Makefile:9: recipe for target 'bin' failed

Pasting the construct into a file and running checkbashsisms:
possible bashism in foo line 2 (brace expansion):
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-06-17 13:54:14 +01:00
Justin Cormack
a9d32026cf Merge pull request #216 from justincormack/docker-1.12.0-rc2
Update to 1.12.0-rc2
2016-06-17 13:25:50 +01:00
Justin Cormack
d5f0876276 Update to 1.12.0-rc2
Currently the repo points to just the cherrypicks, not yet final tag

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-17 13:24:44 +01:00
Justin Cormack
f1093538d8 Merge pull request #215 from djs55/proxy-arg
proxy: add interactive mode with `-i`
2016-06-17 11:59:18 +01:00
David Scott
45bb435b51 proxy: add interactive mode with -i
This allows the proxy to be run easily from a terminal or other script
without requiring fd 3 to be open and writable.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-06-17 11:11:10 +01:00
Justin Cormack
d01628a5b8 Merge pull request #214 from dhiltgen/console
Add support for console on tty1
2016-06-17 01:39:41 +01:00
Daniel Hiltgen
52b43e9482 Add support for console on tty1
When running moby under other hypervisors, requiring troubleshooting on
the serial port can be painful.  This change enables console support on
tty1 similar to the way prior boot2docker images worked.
2016-06-16 17:17:34 -07:00
Justin Cormack
897ca50c40 Merge pull request #213 from justincormack/chronylisten
fix #212 do not let chronyd listen on a port for commands
2016-06-15 15:28:53 +01:00
Justin Cormack
a6819a65ba fix #212 do not let chronyd listen on a port for commands
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-15 15:28:05 +01:00
Justin Cormack
e244acccd4 Merge pull request #211 from justincormack/docker-1.12.0-rc1
Docker 1.12.0 rc1
2016-06-15 10:43:41 +01:00
Justin Cormack
b70b51af18 reverse on Windows check for diagnostics
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-15 10:42:21 +01:00
Justin Cormack
baaa38bc4c default to Docker experimental; later we will need to do multiple builds
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-15 10:28:26 +01:00
Justin Cormack
4544bbac58 update docker to 1.12.0-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-15 10:19:31 +01:00
Justin Cormack
c47e0cf4ad Merge pull request #210 from justincormack/cdrom
Kernel config for CDROM support (for Azure)
2016-06-14 22:09:36 +01:00
Justin Cormack
2ac1a31db1 Merge pull request #209 from djs55/fix-tap-vsockd
tap-vsockd: make sure the service daemonizes properly
2016-06-14 15:49:37 +01:00
David Scott
abe75e4e50 tap-vsockd: make sure the service daemonizes properly
This tells start-stop-daemon to run tap-vsockd as a daemon, and tells
tap-vsockd not to daemonize itself. This seems to work more reliably
than when tap-vsockd self-daemonizes.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-06-14 15:16:56 +01:00
Justin Cormack
77887c4bec Merge pull request #208 from justincormack/1.12-dev
Update to docker 1.12-dev plus proxy patches, close to what will be rc1
2016-06-14 14:15:19 +01:00
Justin Cormack
759ad55f03 Update to docker 1.12-dev plus proxy patches, close to what will be rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-14 14:13:36 +01:00
Justin Cormack
7a9320b931 Kernel config for CDROM support (for Azure)
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-14 11:30:47 +01:00