Commit Graph

1939 Commits

Author SHA1 Message Date
Justin Cormack
41caff5065 update c build base image
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 23:32:47 +00:00
Justin Cormack
1e2929b8c9 Merge pull request #757 from rneugeba/win-tweaks
Minor configuration tweaks
2016-11-18 16:41:14 +00:00
Rolf Neugebauer
d3b065090e 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
f69f9a3427 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
e0eda2d1e0 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
6dedd93cb3 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
c27ea491e8 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
04b981928e Merge pull request #755 from justincormack/check-config-merged
revert to upstream check-config as PR merged
2016-11-18 14:02:35 +00:00
Justin Cormack
734b901d14 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
e48bce798b 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
Justin Cormack
71c899ff46 Merge pull request #752 from rneugeba/v4.8.8-up
kernel: update to 4.8.8
2016-11-18 13:13:36 +00:00
Rolf Neugebauer
4b02dc7ada 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
d4b0ee49c2 Merge pull request #754 from justincormack/config-4.8
Update check-config for Linux 4.8
2016-11-18 11:59:16 +00:00
Justin Cormack
c05ba1397e 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
2759c51105 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
627e665e3d Merge pull request #751 from justincormack/experimental
Default to experimental if not specified in daemon.json
2016-11-18 10:40:55 +00:00
Justin Cormack
2e4ee1a73f 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
7701e2b156 Stop Docker listening on port 2375
This is a huge security hole, remove from Moby.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 21:55:42 +00:00
Justin Cormack
cb9a34cbee Merge pull request #745 from justincormack/1.13-test
upgrade Docker to 1.13.0-rc1
2016-11-16 16:53:21 +00:00
Justin Cormack
d45bf3d89b 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
66c03d8cd5 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
57d023e0b0 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
0f04ceaf40 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
3fe2457e9e 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
52f0c4b132 Merge pull request #742 from justincormack/get-efi
Also pull the efi file when doing make get
2016-11-16 15:46:15 +00:00
Justin Cormack
a7451a2206 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
0d2e507be2 Also pull the efi file when doing make get
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 15:41:52 +00:00
Justin Cormack
5ad811e628 Merge pull request #741 from justincormack/get
Add a script to get current binaries from hub
2016-11-16 15:29:37 +00:00
Justin Cormack
d0f7337014 Add a script to get current binaries
If these have been pushed you can fetch them rather than doing a build. For
use in CI.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 15:22:04 +00:00
Justin Cormack
89f47709dc Merge pull request #740 from justincormack/vsudd-win
always wait for vsudd pidfile
2016-11-16 13:17:42 +00:00
Justin Cormack
32020f01f6 always wait for vsudd pidfile
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 13:07:32 +00:00
Ian Campbell
f8eca9f52e 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
06c4325294 Merge pull request #734 from justincormack/diagnostic-fixes
Fixes to diagnostics
2016-11-15 11:53:10 +00:00
Justin Cormack
b646642194 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
Justin Cormack
3563f60c0f Merge pull request #733 from ijc25/master
diagnostics: Collect "docker info"
2016-11-15 11:43:55 +00:00
Ian Campbell
b4db1822e4 diagnostics: Collect "docker version"
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-15 11:35:12 +00:00
Ian Campbell
dea80af9b1 diagnostics: Collect "docker info"
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-15 11:33:25 +00:00
Justin Cormack
a3243e0bce Merge pull request #732 from justincormack/kernelup
Update to Linux 4.4.32
2016-11-15 11:24:05 +00:00
Justin Cormack
40202381f2 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
b9e6df264f Merge pull request #731 from justincormack/re-revert
Rework moving automount earlier in boot sequence
2016-11-15 10:22:02 +00:00
Justin Cormack
23415c038b 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
ae10c5d46a Merge pull request #729 from justincormack/vsudd-bootmisc
vsudd needs bootmisc too for /run symlink
2016-11-15 00:25:45 +00:00
Justin Cormack
49511ba5ba 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
6529d9f48f Merge pull request #728 from justincormack/var-dirs
add additional directories on newly created /var
2016-11-14 23:36:48 +00:00
Justin Cormack
300ded1ed9 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
bbe778f0d2 Merge pull request #722 from justincormack/fsck-ret
Correctly handle return codes of fsck
2016-11-14 22:30:24 +00:00
Justin Cormack
fc6585df75 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
6cb4f046c4 Merge pull request #727 from justincormack/var-run-link
Fix /run symlink issues
2016-11-14 22:13:17 +00:00
Justin Cormack
bd800943d9 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
01e1d43fe7 Merge pull request #726 from justincormack/moby-script-reboot
improve restart of osx script
2016-11-14 20:48:06 +00:00