Commit Graph

1120 Commits

Author SHA1 Message Date
Justin Cormack
d1a1d7846b Update Docker init script for 1.13
- never update root filesystem see #583
- remove tests for earlier docker versions
- only use iptables override on desktop

fix #753

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 21:15:24 +00:00
Justin Cormack
35fdd3268a Update base image to Alpine 3.5-rc2
- switch to libressl
- hvtools in main

Note the build images are not switched over yet

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 20:30:33 +00:00
Justin Cormack
36c25e442d Remove Alpine packages just used for debugging and build
- make, GNU tar only used for self hosting
- strace, ipvsadmin, openssl just for debug

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 20:15:37 +00:00
Justin Cormack
94d6bbfa83 Merge pull request #764 from justincormack/extend
Simplify file system format code
2016-11-21 19:53:43 +00:00
Justin Cormack
db3cbe2eb2 Simplify file system format code
- use our own code rather than Alpine setup-disk
- remove alpine setup code as not needed
- do not create swap partitions
- create swap file on desktop editions for now (may remove)

Fix #619

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 18:35:13 +00:00
Justin Cormack
c19e17284d Merge pull request #702 from justincormack/syslog
Syslog support for docker logs
2016-11-21 17:47:31 +00:00
Justin Cormack
994eeadb1c Merge pull request #761 from ijc25/kernel-patch-whitespace
Fixup kernel patch whitepace
2016-11-21 15:20:57 +00:00
Justin Cormack
a08e06bc44 Upgrade Linux to 4.8.10
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 15:03:48 +00:00
Ian Campbell
8e0e003b50 Fixup kernel patch whitepace
Some of git's whitespace fixup option corrupts the patches by (at least)
stripping trailing spaces (which are present for empty lines in context) and
changing leading <space><tab> into just <tab>. `patch(1)` used by the build
here seems to tolerate this, but `git am` and/or `git apply` do not.

Fix this up by running git am and at each failure point (i.e. every patch)
applying the relevant patch using `patch(1)` (which works because `git am` was
unable to even partially apply the patches) before regenerating the whole lot
with `git format-patch`.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-21 11:43:48 +00:00
Justin Cormack
b8dbdaaf8a Update Linux to 4.8.9
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-19 22:37:22 +00:00
Justin Cormack
158cefabe3 Add some basic shell commands in media image for debug
Add toybox statically linked ls, sh, find etc so that it is
possible to examine the archive eaily.

Fix #749

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-19 16:19:59 +00:00
Justin Cormack
88eafcc239 update c build base image
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 23:32:47 +00:00
Rolf Neugebauer
a804ac8399 kernel: limit number of CPUs to 128
128 CPUs seems plenty for now and it allows for the
debug kernels to boot on Hyper-V without modifications. It may
also have the added benefit of reducing some data structures
allocated per CPU (in particular for Debug kernels).

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-11-18 16:36:23 +00:00
Justin Cormack
a85dbe129d Use syslog local0 for docker logs
This allows log rotation, redirect via syslog etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 16:23:41 +00:00
Justin Cormack
5ee7875ac4 Remove syslog conf file
We are not using busybox syslog any more so this is unused.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 16:23:41 +00:00
Rolf Neugebauer
3c2f93fd69 efi: add 'noautodetect' to kernel commandline
This stops device auto-detect in 'hwdrivers'. On Docker
for Windows driver auto-detect should not be necessary as all
drivers are compiled in.

Further, on slow machines (and in CI) th 'hwdrivers' seems to have
race as it does a 'find' on '/sys/devices' and then performs actions.
On slow machines (and in CI) it appears that VMBus devices get
removed (and possibly re-added) causing the script to error.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-11-18 16:21:20 +00:00
Justin Cormack
91d7c11cea Merge pull request #756 from justincormack/config-4.8
Make oldconfig for 4.8.8 kernel
2016-11-18 14:17:12 +00:00
Justin Cormack
444e01d703 Make oldconfig for 4.8.8 kernel
Most new options disabled, a few picked.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 13:46:29 +00:00
Justin Cormack
163fa8e7c0 revert to upstream check-config as PR merged
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 13:30:39 +00:00
Rolf Neugebauer
c782a2244e kernel: update to 4.8.8
This removes all the patches which have been upstreamed since 4.4.x
and only leaves patches for a minor fix to AF_VSOCK, the Hyper-V socket patch
and a new patch for fixing delays on creating netns with tunnel interfaces.

The latter has been accecpted into the upstream netdev branch and will
likely appear in 4.9.0 and we can cherry pick from there then.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-11-18 12:58:17 +00:00
Justin Cormack
f5e2adadff Update check-config for Linux 4.8
Temporarily using unmerged version until upstream.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 11:50:36 +00:00
Justin Cormack
a0bddd4f54 Merge pull request #743 from justincormack/no-bind-log
Do not try to bind mount logs onto host on osx
2016-11-18 10:43:50 +00:00
Justin Cormack
b5d7cc306c Default to experimental if not specified in daemon.json
Most editions were shipping with experimental; now it is a daemon
flag this seems the best behaviour.

Only do this on recent dockerd as we are still supporting 1.12 for
a while longer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-17 20:46:44 +00:00
Justin Cormack
040d6faeab upgrade Docker to 1.13.0-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 16:48:26 +00:00
Justin Cormack
78d0f03b65 Do not try to bind mount logs onto host on osx
This is not working well, and was binding over the logs, and losing
logs. We need a uniform approach on all platforms, planned to be
syslog.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 16:08:03 +00:00
Justin Cormack
556560b6c9 Merge pull request #719 from simonferquel/boot_options_hyperv
Setting kernel boot params values as recommended by Microsoft for Azure (should avoid slow boots) and disabling efi framebuffer (should avoid hanging on efi fb setup)
2016-11-16 16:06:33 +00:00
Simon Ferquel
1edae91c22 Setting kernel boot parametters recommended for Azure/HyperV
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2016-11-16 11:01:48 -05:00
Justin Cormack
da729cffff Merge pull request #738 from ijc25/master
diagnostics: Collect networking and swarm node + service info
2016-11-16 15:57:33 +00:00
Justin Cormack
9480827b98 Disable EFI framebuffer
Azure only uses the Hyper-V framebuffer, so we should not need this.

Simplify setup for graphics options we are not using.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 10:42:19 -05:00
Justin Cormack
8d406aa46e always wait for vsudd pidfile
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 13:07:32 +00:00
Ian Campbell
33c80ced24 diagnostics: Collect networking and swarm node + service info
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-15 17:21:03 +00:00
Justin Cormack
d661b49ff9 Merge pull request #734 from justincormack/diagnostic-fixes
Fixes to diagnostics
2016-11-15 11:53:10 +00:00
Justin Cormack
de5bb1c1b9 Fixes and improvements to diagnostics
- We now only have nslookup not dig.
- Use curl not wget.
- add /proc/cpuinfo

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-15 11:45:29 +00:00
Ian Campbell
e950150495 diagnostics: Collect "docker version"
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-15 11:35:12 +00:00
Ian Campbell
5191a8ffbc diagnostics: Collect "docker info"
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-15 11:33:25 +00:00
Justin Cormack
b20125d3ab Update to Linux 4.4.32
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-15 10:27:18 +00:00
Justin Cormack
a3cb39e21a Rework moving automount earlier in boot sequence
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-15 09:54:07 +00:00
Justin Cormack
99018b9424 vsudd needs bootmisc too for /run symlink
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-15 00:19:21 +00:00
Justin Cormack
a476918263 add additional directories on newly created /var
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 23:15:46 +00:00
Justin Cormack
345f6c34d3 Correctly handle return codes of fsck
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 22:14:25 +00:00
Justin Cormack
96399432f3 Fix /run symlink issues
- run bootmisc before sysklogd so symlinks from /var/run to
  /run are created
- recreate symlinks that bootmisc created when we remount /var
  until this gets moved earlier

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 22:00:12 +00:00
Justin Cormack
bf2ee91861 Revert "Use /run for pidfiles for sysklogd"
This reverts commit b8ff787239.

syslogd always uses /var/run internally, need to fix symlinks.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 19:55:07 +00:00
Justin Cormack
b8ff787239 Use /run for pidfiles for sysklogd
This is the real location, and /var may be overmounted.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 18:38:37 +00:00
Justin Cormack
2174a9371b Always start vsudd before syslog
If we are using vsudd to forward syslog to the host, as on osx,
we need to start it before syslog starts, and make sure it has
created its socket.

Add a pidfile to vsudd to make startup more reliable.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 17:08:37 +00:00
Justin Cormack
c85a49b628 Merge pull request #718 from justincormack/diagnose-test
Make diagnostics program return exit code
2016-11-14 11:38:42 +00:00
Justin Cormack
b7550df1c5 Make diagnostics program return exit code
Add running diagnostics to test script.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 11:30:09 +00:00
Justin Cormack
00ee4be2b5 remove completion directory from newer docker downloads
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 11:00:28 +00:00
Justin Cormack
fe3f584296 update Linux to 4.4.31
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-12 16:30:44 +00:00
Justin Cormack
8dbaef8b9c Revert "Format filesystems earlier, before syslog"
This reverts commit 4dd5dca106.

Fix #710 where system hangs after klogd startup on AWS. Possibly
also affects Windows too. Still unclear why but lets revert and
continue investif=gating.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-12 15:29:27 +00:00
Justin Cormack
8a2ddac685 Update base image
- tar update

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-08 21:06:45 +00:00