Commit Graph

1466 Commits

Author SHA1 Message Date
Justin Cormack
b08fc08db6 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
Justin Cormack
c5c94a565e 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
44bc83b7d9 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
aaa3ebaa06 Merge pull request #678 from justincormack/checkup
Update check-config script
2016-11-04 09:48:12 +00:00
Justin Cormack
de81602c68 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
1672c5ded7 Merge pull request #674 from nathanleclaire/migrate_storage_account
Migrate default storage account
2016-11-03 08:55:34 +00:00
Nathan LeClaire
581567e79c Migrate default storage account
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-11-02 16:30:36 -07:00
Justin Cormack
7752c39b73 Merge pull request #672 from justincormack/configup
Update check-config script
2016-11-02 21:11:36 +00:00
Nathan LeClaire
0fb36c60a6 Merge pull request #579 from justincormack/vhdfix2
Use alpine to do raw2vhd
2016-11-02 13:26:00 -07:00
Justin Cormack
e09867cd57 Merge pull request #670 from justincormack/ipvsadm
Add ipvsadm for debugging
2016-11-02 20:09:07 +00:00
Justin Cormack
2ad01784ab 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
e337dafea9 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
90d2d1ef45 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
edde24b319 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
b8baec0835 Merge pull request #668 from justincormack/kernelup
update Linux to 4.4.30
2016-11-01 22:17:08 +00:00
Justin Cormack
a77b91a022 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
503eb2dcaf Merge pull request #663 from justincormack/curl-fail
make curl fail on 404
2016-11-01 19:55:55 +00:00
Justin Cormack
df558656d3 Merge pull request #666 from justincormack/fsck
fsck filesystem before mount
2016-11-01 16:10:05 +00:00
Justin Cormack
76e902926a 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
c758ca67ce make curl fail on 404
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-01 13:58:02 +00:00
Justin Cormack
18a507cc33 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
07126f490b 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
a4f15eba54 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
f9563cff68 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
ff5cf260fc Merge pull request #658 from justincormack/hyperkit
Add hyperkit build
2016-10-31 15:43:50 +00:00
Justin Cormack
bd839a3cf8 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
8966111b63 Merge pull request #657 from justincormack/kernelup
Linux 4.4.29
2016-10-31 13:41:41 +00:00
Justin Cormack
4bf6d527c4 Merge pull request #653 from justincormack/audit
Add audit to kernel config
2016-10-31 13:15:49 +00:00
Justin Cormack
ecc511b0a2 Linux 4.4.29
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-31 13:12:43 +00:00
Justin Cormack
c5e1bf4498 Merge pull request #654 from justincormack/net-sysctl
Increase neighbor cache threshold values
2016-10-28 22:30:10 +01:00
Justin Cormack
248a3c39f9 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
81cf1eeed4 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
61bcb19ba5 Merge pull request #651 from justincormack/kernelup
upgrade Linux to 2.4.28
2016-10-28 15:08:45 +01:00
Justin Cormack
08fd4f9f19 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
b00f0d8f32 Merge pull request #645 from justincormack/check-config
Add check-config container and test
2016-10-28 12:53:17 +01:00
Justin Cormack
8cfc2c753f 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
1a0b395496 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
80849b4ac3 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
e953c98fa1 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
b4bee2840b 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
a44aee4702 Merge pull request #636 from justincormack/ppp0
Additional requested kernel features
2016-10-27 13:11:01 +01:00
Justin Cormack
631206aea7 Merge pull request #640 from justincormack/makefile-dep
Add dependency to Makefile for Docker
2016-10-27 13:04:20 +01:00
Justin Cormack
30dff6a0f4 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
80964929aa 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
a25973608e 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
14a1821e25 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
87f240ffde Merge pull request #634 from justincormack/ptmx
Add mutiple pts support
2016-10-26 15:26:00 +01:00
Justin Cormack
4370b52ff9 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
911ea3945f 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
Justin Cormack
8ff328ee23 Merge pull request #631 from justincormack/kerneldown
Revert to 4.4. series kernel
2016-10-25 10:17:02 +01:00