Commit Graph

1653 Commits

Author SHA1 Message Date
Justin Cormack
218e345136 Curl security update
Upgrade to 7.51, fix the following CVEs

  CVE-2016-7141, CVE-2016-7167, CVE-2016-8615, CVE-2016-8616,
  CVE-2016-8617, CVE-2016-8618, CVE-2016-8619, CVE-2016-8620,
  CVE-2016-8621, CVE-2016-8622, CVE-2016-8623, CVE-2016-8624

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-06 19:32:19 +00:00
Nathan LeClaire
b737435985 Add support for building smaller Azure VHD for development
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-11-04 17:14:33 -07:00
Justin Cormack
f7d275918e Merge pull request #680 from justincormack/diagnostics-mount
Improve matching of mounted drive in diagnostics
2016-11-04 15:24:44 +00:00
Justin Cormack
a7d223768c Improve matching of mounted drive in diagnostics
Was failing on AWS as drive did not match patter that was too precise.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-04 14:09:12 +00:00
Justin Cormack
b6a7546eac Merge pull request #678 from justincormack/checkup
Update check-config script
2016-11-04 09:48:12 +00:00
Justin Cormack
95b62daa5a Update check-config script
Now returns error if checks do not pass.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-04 09:40:15 +00:00
Justin Cormack
a4015f736b Merge pull request #674 from nathanleclaire/migrate_storage_account
Migrate default storage account
2016-11-03 08:55:34 +00:00
Nathan LeClaire
a2278219ef Migrate default storage account
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-11-02 16:30:36 -07:00
Justin Cormack
9512b2fa84 Merge pull request #672 from justincormack/configup
Update check-config script
2016-11-02 21:11:36 +00:00
Nathan LeClaire
56e0bdad03 Merge pull request #579 from justincormack/vhdfix2
Use alpine to do raw2vhd
2016-11-02 13:26:00 -07:00
Justin Cormack
e30acbc517 Merge pull request #670 from justincormack/ipvsadm
Add ipvsadm for debugging
2016-11-02 20:09:07 +00:00
Justin Cormack
3c2e1a6eb9 Merge pull request #671 from justincormack/split-hostsettings
Split out Windows network config from hostsettings
2016-11-02 20:08:12 +00:00
Justin Cormack
1d71d7c3e1 Update check-config script
Now misses the ext3 error messages.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-02 20:05:48 +00:00
Justin Cormack
fed22cee00 Split out Windows network config from hostsettings
On cloud editions eg AWS settings may come from the network, so
we need to move this to after network setup, while the Windows
network config changes need to happen before, so split the init script.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-02 14:49:24 +00:00
Justin Cormack
7c43ec4d01 Add ipvsadm for debugging
Fix #437

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-02 00:10:16 +00:00
Justin Cormack
5120ea2fb3 Merge pull request #668 from justincormack/kernelup
update Linux to 4.4.30
2016-11-01 22:17:08 +00:00
Justin Cormack
5866d4a83b update Linux to 4.4.30
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-01 20:50:12 +00:00
Justin Cormack
9b58a9921b Merge pull request #663 from justincormack/curl-fail
make curl fail on 404
2016-11-01 19:55:55 +00:00
Justin Cormack
f7b9826a66 Merge pull request #666 from justincormack/fsck
fsck filesystem before mount
2016-11-01 16:10:05 +00:00
Justin Cormack
72d1aef471 fsck filesystem before mount
Use fsck -p to fix errors that are fixable.

Note this will recreate the filesystem on fatal errors.

Fix #665

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-01 16:01:08 +00:00
Justin Cormack
50a64ac6c4 make curl fail on 404
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-01 13:58:02 +00:00
Justin Cormack
0f357d2ed5 Merge pull request #662 from justincormack/repeat-ami
Add a base image for building AMIs
2016-11-01 13:47:51 +00:00
Justin Cormack
fbebf2a131 Add a base image for building AMIs
Faster and more repeatable. As the Alpine edge package is not
working, use pip.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-01 13:26:44 +00:00
Justin Cormack
928d9197ee Merge pull request #659 from justincormack/hyperkit-tweak
improve hyperkit build to do sudo in the right place
2016-10-31 16:14:00 +00:00
Justin Cormack
473d0e37c7 improve hyperkit build to do sudo in the right place
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-31 16:04:25 +00:00
Justin Cormack
a56ca7fbb1 Merge pull request #658 from justincormack/hyperkit
Add hyperkit build
2016-10-31 15:43:50 +00:00
Justin Cormack
b6c6ec8905 Add hyperkit build
Useful for local performance tests

Fix #443

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-31 15:34:56 +00:00
Justin Cormack
805a5fa48a Merge pull request #657 from justincormack/kernelup
Linux 4.4.29
2016-10-31 13:41:41 +00:00
Justin Cormack
de2d7626d9 Merge pull request #653 from justincormack/audit
Add audit to kernel config
2016-10-31 13:15:49 +00:00
Justin Cormack
933cfbf2db Linux 4.4.29
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-31 13:12:43 +00:00
Justin Cormack
330b43de48 Merge pull request #654 from justincormack/net-sysctl
Increase neighbor cache threshold values
2016-10-28 22:30:10 +01:00
Justin Cormack
53e367326b Increase neighbor cache threshold values
Needed for larger clusters.

Needed for https://github.com/docker/editions/issues/377

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-28 22:25:36 +01:00
Justin Cormack
62a738a965 Add audit to kernel config
Currently just has syscall audit as no LSM.

See #52

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-28 18:12:51 +01:00
Justin Cormack
709d0fc334 Merge pull request #651 from justincormack/kernelup
upgrade Linux to 2.4.28
2016-10-28 15:08:45 +01:00
Justin Cormack
a2bb950d3f upgrade Linux to 2.4.28
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-28 14:09:20 +01:00
Justin Cormack
6254e3b541 Merge pull request #645 from justincormack/check-config
Add check-config container and test
2016-10-28 12:53:17 +01:00
Justin Cormack
249df1e912 Add check-config container and test
Currently the test will never fail, planning to fix this upstream.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-28 12:39:31 +01:00
Justin Cormack
a9945bf2d2 Merge pull request #644 from justincormack/kernel-ops
Add Memory Resource Controller Kernel Memory accounting cgroup support
2016-10-28 11:33:12 +01:00
Justin Cormack
eec756c494 Add Memory Resource Controller Kernel Memory accounting cgroup support
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-28 11:06:07 +01:00
Justin Cormack
3df12f9ab8 Merge pull request #642 from justincormack/no-latest
do not push a latest tag on make media
2016-10-27 14:57:34 +01:00
Justin Cormack
052116d7b9 do not push a latest tag on make media
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-27 14:53:29 +01:00
Justin Cormack
f84493af64 Merge pull request #636 from justincormack/ppp0
Additional requested kernel features
2016-10-27 13:11:01 +01:00
Justin Cormack
4c3d289cd1 Merge pull request #640 from justincormack/makefile-dep
Add dependency to Makefile for Docker
2016-10-27 13:04:20 +01:00
Justin Cormack
cc903c3fa5 Add dependency to Makefile for Docker
The Docker version is in the Makefile su always re-upload if changed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-27 11:29:31 +01:00
Justin Cormack
2df41c24e2 Merge pull request #638 from justincormack/docker-1.12.3
update Docker to 1.12.3
2016-10-27 09:25:50 +01:00
Justin Cormack
e08b05b0ad update Docker to 1.12.3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-27 09:14:20 +01:00
Justin Cormack
9deed26ba6 Additional requested kernel features
- PPP https://github.com/docker/for-mac/issues/851
- NBD for infinit
- extra virtualisation options

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-26 17:00:24 +01:00
Justin Cormack
ad3ba278b5 Merge pull request #634 from justincormack/ptmx
Add mutiple pts support
2016-10-26 15:26:00 +01:00
Justin Cormack
65b7194e13 Add mutiple pts support
I think this may have got mangled in the kernel upgrade/downgrade.

diff file is still messy due to version changes.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-26 15:08:14 +01:00
Justin Cormack
2d7ec8903d Merge pull request #633 from justincormack/docker-1.12.3-rc1
Update to docker 1.12.3-rc1
2016-10-25 10:17:16 +01:00