Commit Graph

1791 Commits

Author SHA1 Message Date
Justin Cormack
f03f3d594b 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
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
0d2406d9ff 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
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
e472be621f 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
6b08890a9c 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
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
9798a136e6 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
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
6fa0e3a2d4 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
f292de900b 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
7d22f18e7a 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
7e0a3949a9 Merge pull request #740 from justincormack/vsudd-win
always wait for vsudd pidfile
2016-11-16 13:17:42 +00: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
Justin Cormack
31489809aa Merge pull request #733 from ijc25/master
diagnostics: Collect "docker info"
2016-11-15 11:43:55 +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
7971501f0d Merge pull request #732 from justincormack/kernelup
Update to Linux 4.4.32
2016-11-15 11:24:05 +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
30c85b8895 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
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
1ac1201457 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
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
e2918a8e5d 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
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
57ad432e8a Merge pull request #722 from justincormack/fsck-ret
Correctly handle return codes of fsck
2016-11-14 22:30:24 +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
67b0be6ba1 Merge pull request #727 from justincormack/var-run-link
Fix /run symlink issues
2016-11-14 22:13:17 +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
dfd17258cf Merge pull request #726 from justincormack/moby-script-reboot
improve restart of osx script
2016-11-14 20:48:06 +00:00
Justin Cormack
97d2850910 Merge pull request #725 from justincormack/revert-run
Revert "Use /run for pidfiles for sysklogd"
2016-11-14 20:35:41 +00:00
Justin Cormack
2b75883e36 improve restart of osx script
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 20:34:57 +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
5cc9d70e1d Merge pull request #723 from justincormack/syslog-run-not-var-run
Use /run for pidfiles for sysklogd
2016-11-14 18:44:57 +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
9bcc33acc5 Merge pull request #721 from justincormack/vsudd-before-syslog
Always start vsudd before syslog
2016-11-14 17:22:32 +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
a1ed712612 Merge pull request #717 from justincormack/more-space
Docker 1.13 needs more disk space
2016-11-14 11:30:48 +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
7e5803db40 Merge pull request #716 from justincormack/completion-deletion
remove completion directory from newer docker downloads
2016-11-14 11:21:12 +00:00
Justin Cormack
cc4157224b Docker 1.13 needs more disk space
Swarm mode now `fallocate`s a whole lot of space, so give it more so
test passes.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 11:20:09 +00:00