Commit Graph

1653 Commits

Author SHA1 Message Date
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
Justin Cormack
784d8eacca 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
8a5f15a6bd improve restart of osx script
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 20:34:57 +00:00
Justin Cormack
dc10cff096 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
396bb8f4e8 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
29df1f9f7b 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
f81abe7a39 Merge pull request #721 from justincormack/vsudd-before-syslog
Always start vsudd before syslog
2016-11-14 17:22:32 +00:00
Justin Cormack
9d81e2efef 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
49aee29e9c Merge pull request #718 from justincormack/diagnose-test
Make diagnostics program return exit code
2016-11-14 11:38:42 +00:00
Justin Cormack
4d4f0dd141 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
a494a39142 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
bf72303a95 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
b4f2d92bd6 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
Justin Cormack
b356364777 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
afc48d581d Merge pull request #711 from justincormack/kernelup
update Linux to 4.4.31
2016-11-12 16:44:25 +00:00
Justin Cormack
ab5a4b580c 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
9f65ddda59 Merge pull request #712 from justincormack/revert-disk-format-change
Revert "Format filesystems earlier, before syslog"
2016-11-12 15:41:11 +00:00
Justin Cormack
b042b5127f 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
523a4302b7 Merge pull request #706 from justincormack/baseup
Update base image
2016-11-08 21:18:10 +00:00
Justin Cormack
43d956c201 Update base image
- tar update

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-08 21:06:45 +00:00
Justin Cormack
454733e025 Merge pull request #705 from justincormack/kernel-tweaks
Update kernel config
2016-11-08 18:34:59 +00:00
Justin Cormack
2be2b4b08f Merge pull request #683 from nathanleclaire/make_vhd_build_more_bearable
Add support for building smaller Azure VHD for development
2016-11-08 16:26:10 +00:00
Justin Cormack
d81f00b125 Update kernel config
- remove unused graphics options
- move W^X test to debug kernel #685
- reboot on kernel panic fix #660

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-08 16:12:29 +00:00
Justin Cormack
e3169f68d7 Merge pull request #703 from justincormack/move-disk-format
Format filesystems earlier, before syslog
2016-11-08 15:30:53 +00:00
Justin Cormack
9a95224681 Format filesystems earlier, before syslog
So that we can write to /var early, move filesystem formatting as early as possible.

Adds a dummy fsck service, as we already do fsck in format script.

Replaces #535

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-08 15:20:46 +00:00
Justin Cormack
1f0795228e Merge pull request #701 from justincormack/no-lvm2
Remove lvm2 package
2016-11-08 11:08:03 +00:00
Justin Cormack
85fd9a96ae Remove lvm2 package
We have no lvm support, so not needed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-08 10:48:44 +00:00
Justin Cormack
7153308e49 Merge pull request #700 from justincormack/baseup
Update base image
2016-11-08 10:38:35 +00:00
Justin Cormack
db3be17a84 Remove bind tools
We are not using these anywhere, busybox provides some of them.

Avoids security warnings.

Rework of #684

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-08 10:14:07 +00:00
Justin Cormack
dc8b40f0e1 Update base image
- bind update
- edge packages moved to 3.5

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-08 10:09:10 +00:00
Justin Cormack
3eed70710b Merge pull request #696 from justincormack/media-fix
remove bios media from Dockerfile and add vmlinux
2016-11-07 16:30:24 +00:00
Justin Cormack
0011cee527 remove bios media from Dockerfile and add vmlinux
Fixes `make media`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-07 16:22:11 +00:00
Justin Cormack
f8a66ec47e Merge pull request #692 from justincormack/vmlinux
Keep vmlinux in build media for kernel debugging
2016-11-07 15:55:31 +00:00
Justin Cormack
8ca9221bf5 Merge pull request #693 from justincormack/smaller-media
Do not include non-efi ISO in media
2016-11-07 14:57:37 +00:00
Justin Cormack
6132c69857 Keep vmlinux in build media for kernel debugging
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-07 14:45:37 +00:00
Justin Cormack
020f0be85e Do not include non-efi ISO in media
We are not using this for editions.

We should be able to make a dual boot ISO, or you can create from the other
artefacts anyway.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-07 14:37:24 +00:00
Justin Cormack
9d9915eb7f Merge pull request #687 from justincormack/curlup
Curl security update
2016-11-06 19:39:30 +00:00