Commit Graph

1791 Commits

Author SHA1 Message Date
Justin Cormack
1ee837105f Merge pull request #783 from justincormack/docker-1.13.0-rc2
Update to Docker 1.13.0-rc2
2016-11-23 13:44:47 -08:00
Justin Cormack
8d7957951c Update to Docker 1.13.0-rc2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 21:40:23 +00:00
Justin Cormack
e65098fff2 Merge pull request #779 from justincormack/noexec-run
Make /run nosuid,noexec
2016-11-23 06:42:55 -08:00
Justin Cormack
4bdbcbcc33 Merge pull request #780 from justincormack/iptables-proxy
Explicitly use slirp-proxy in iptables
2016-11-23 06:42:46 -08:00
Justin Cormack
bd25c68032 Explicitly use slirp-proxy in iptables
So as to allow a read only root filesystem, we use the proxy
path config option to override the Docker proxy for 1.13.

This means that the iptables override needs to call this binary
not the original docker-proxy binary to allow port forwarding.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 13:48:27 +00:00
Justin Cormack
de7bc5103d Make /run nosuid,noexec
This was not sufficiently locked down.

Fix #720

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 12:08:53 +00:00
Justin Cormack
6ee9eeb284 Merge pull request #777 from justincormack/win-trim
Run TRIM on Windows every 15m
2016-11-23 03:37:33 -08:00
Justin Cormack
b6551b1648 Merge pull request #776 from justincormack/small-swap
Do not create swap file if the disk is small
2016-11-23 03:32:33 -08:00
Justin Cormack
3dc7419954 Run TRIM on Windows every 15m
As the Windows virtual device supports TRIM we can run this to free
up disk space frequently. Not recommended to run on physical devices
this often.

See https://github.com/docker/pinata/issues/5298

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 11:30:35 +00:00
Justin Cormack
4619368531 Do not create swap file if the disk is small
- on very small disks, eg CI, do not create a swap file.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 11:25:19 +00:00
Justin Cormack
9f45664f6f Merge pull request #775 from justincormack/extend
Resize device if there is free space
2016-11-22 14:41:55 -08:00
Justin Cormack
605c34be64 Resize device if there is free space
If the block device has unused free space, extend the filesystem on it.

Fix #120

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-22 21:59:53 +00:00
Justin Cormack
c686b47a99 Merge pull request #774 from nathanleclaire/azure_init_beta12
Azure init beta12
2016-11-21 23:54:17 +00:00
Nathan LeClaire
7fb43cb289 Include version and daemon.json in Azure init script
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-11-21 15:43:19 -08:00
Justin Cormack
762852b1d4 Merge pull request #773 from justincormack/typo
fix typo making swap file
2016-11-21 23:06:14 +00:00
Justin Cormack
3204fafc54 fix typo making swap file
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 23:02:44 +00:00
Justin Cormack
a4212b2cbf Merge pull request #770 from rneugeba/kernel-fix
kernel: update/fix patches for 4.8.10
2016-11-21 22:06:27 +00:00
Justin Cormack
a042d4d67d Merge pull request #769 from justincormack/nossh
Remove ssh server packages
2016-11-21 21:56:37 +00:00
Justin Cormack
30f14dd622 Remove ssh server packages
These will be containerised, and were disabled anyway.

Need client, as git needs it, and docker needs git.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 21:47:10 +00:00
Rolf Neugebauer
df67417538 kernel: update/fix patches for 4.8.10
In particular 8e0e003b50
seem to have remove the net/Kconfig changes

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-11-21 21:37:05 +00:00
Justin Cormack
7f75a78b87 Merge pull request #768 from justincormack/no-1.12
Update Docker init script for 1.13
2016-11-21 21:32:06 +00:00
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
afd3238d25 Merge pull request #766 from justincormack/alpine-3.5-rc2
Update base image to Alpine 3.5-rc2
2016-11-21 20:37:01 +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
f49ff89db8 Merge pull request #765 from justincormack/no-debug
Remove Alpine packages just used for debugging and build
2016-11-21 20:21:49 +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
543efa6a0d Merge pull request #763 from justincormack/kernelup
Upgrade Linux to 4.8.10
2016-11-21 15:20:30 +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
889bc57779 Merge pull request #760 from justincormack/kernelup
Update Linux to 4.8.9
2016-11-19 23:03:17 +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
c7a55863cc Merge pull request #759 from justincormack/toybox
Add some basic shell commands in media image for debug
2016-11-19 17:53:21 +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
a10d31848e Merge pull request #758 from justincormack/baseup
update c build base image
2016-11-18 23:50:18 +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
Justin Cormack
6d5c374a6f Merge pull request #757 from rneugeba/win-tweaks
Minor configuration tweaks
2016-11-18 16:41:14 +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
6a7769ada3 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
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
Justin Cormack
03dc7ee2cc 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
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