Commit Graph

3408 Commits

Author SHA1 Message Date
Riyaz Faizullabhoy
3230fd4a30 also fix typo
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-24 13:08:15 -07:00
Riyaz Faizullabhoy
48a4376517 sig-security: Add video recording to meeting notes
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-24 11:52:20 -07:00
Riyaz Faizullabhoy
47b31f5aae Merge pull request #1892 from tych0/sig-security-2017-05-24
sig-security: 2017-05-24 meeting notes
2017-05-24 11:26:28 -07:00
Tycho Andersen
dfbbfee3b5 fixes from review
* make each relevant heading a link
* HP->HPE, fix spelling of Arxan
* add mainline linuxkit insecure blurb

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-24 11:35:14 -06:00
Tycho Andersen
020c84d01f sig-security: 2017-05-24 meeting notes
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-24 11:04:44 -06:00
Justin Cormack
5500302ba5 Merge pull request #1890 from justincormack/collective-responsibility
Remove AUTHOR from tests
2017-05-24 16:57:37 +01:00
Justin Cormack
41422b3057 Remove AUTHOR from tests
This goes against collective responsibility for code. If you want to know the
author use git.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-24 16:33:09 +01:00
Rolf Neugebauer
f02efdccc5 Merge pull request #1888 from rneugeba/qemu
cmd: Unify disk command line options for local hypervisors
2017-05-24 16:28:59 +01:00
Justin Cormack
8d97247d8c Merge pull request #1877 from tych0/real-kernel-config-impl
kernel-config project: add a real implementation of kernel configs
2017-05-24 16:16:33 +01:00
Justin Cormack
6b54f43c4c Merge pull request #1885 from tych0/CVE-2017-1000363
docs: add a blurb about CVE-2017-1000363
2017-05-24 16:08:14 +01:00
Rolf Neugebauer
f90fde5a6f cmd: Unify disk command line options for local hypervisors
- '-disk-size' is now defaults to MB (but can be GB when appending 'G')
- The disk will be created if it doesn't exist (didn't happen in qemu)

Update the documentation.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-24 16:05:06 +01:00
Rolf Neugebauer
bd43e35846 Merge pull request #1887 from rneugeba/base
tools: Add VM integration agents to the Alpine base
2017-05-24 10:01:33 +01:00
Rolf Neugebauer
a73be1d7ef tools: Add VM integration agents to the Alpine base
Add the Qemu, Hyper-V and VMware VM tools to the base

Also update the versions file.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-24 09:35:37 +01:00
Tycho Andersen
90c7047973 docs: add a blurb about CVE-2017-1000363
As of the time of this patch, the CVE was not available yet in the mitre
db.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-23 16:03:00 -06:00
Rolf Neugebauer
72ad8ac3a3 Merge pull request #1884 from rneugeba/cfg
Add moby config label to common packages
2017-05-23 16:38:20 +01:00
Rolf Neugebauer
ae5dfc6d7d Update all YAML files to use the new binfmt, dhcpcd and rngd packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-23 15:55:40 +01:00
Rolf Neugebauer
3dda372640 pkg: Add moby config label to the rngd package
While at it, also update the Alpine base to a newer version.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-23 15:55:40 +01:00
Rolf Neugebauer
5cbd2d1a9a pkg: Add moby config label to binfmt package
While at it also update to the newer Alpine base image

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-23 15:55:33 +01:00
Rolf Neugebauer
b9172f2dd6 pkg: Add moby config label to dhcpcd package
This specifies the capabilities and bind mounts the dhcpcd daemon
needs.

While at it also update the Alpine base image

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-23 15:55:33 +01:00
Justin Cormack
454c0df1b5 Merge pull request #1879 from rneugeba/author
Add a few more aliases to .mailmap and re-generated AUTORS
2017-05-23 15:31:41 +01:00
Rolf Neugebauer
dde313fd64 Merge pull request #1881 from rneugeba/redis
examples: switch dhcpd to onboot in redis-os example
2017-05-23 14:16:57 +01:00
Rolf Neugebauer
d0aa269a49 examples: switch dhcpd to onboot in redis-os example
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-23 13:37:38 +01:00
Justin Cormack
95a1491151 Merge pull request #1873 from justincormack/qemu-cleanup
Clean up of Qemu run
2017-05-23 12:57:30 +01:00
Rolf Neugebauer
772370fb2c Add a few more aliases to .mailmap and re-generated AUTORS
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-23 12:13:11 +01:00
Justin Cormack
838d845003 Clean up of Qemu run
For all output formats except kernel+initrd, you must use the full path of
the file they want to run. Make the options auto detect.

Split the uefi option to mean "use uefi firmware" not be ISO specific.

Allow specifying a bootable disk image, so we can test disk image output
formats with qemu too.

Add a test case for qcow2 boot under qemu.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-23 09:22:39 +01:00
Riyaz Faizullabhoy
bd7148856a Merge pull request #1876 from riyazdf/sig-agenda
Add more detail to security SIG agenda
2017-05-22 16:52:57 -07:00
Tycho Andersen
ef4bd01de8 kernel-config project: add draft of kernel configs
The kernel configs themselves are stored as diffs of what we want vs. each
version's defconfig.

Thus, things like e.g. CONFIG_DEVKMEM drop out after it was made
non-default. The implication of this is (I hope) that as upstream adopts
security features, our delta can shrink (or more realistically, only
include the next-next gen features).

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 17:51:09 -06:00
Riyaz Faizullabhoy
f0c0981ac7 add more detail to security SIG agenda
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-22 16:30:01 -07:00
Tycho Andersen
d6269d8504 kernel-config project: add kcimport script
This is the script I used with [1] to generate the config diffs and
separate out the arch specific bits. Included mostly just so people can
play around with it if they want to generate their own diffs.

[1]: https://github.com/ulfalizer/Kconfiglib

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Tycho Andersen
8a140cefd8 projects: update list of kernels in kernel-config
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Tycho Andersen
ee4d74aca6 projects: be more clever about merging kernel config
In particular, let's start with a defconfig and edit it, rather than try to
generate the config entirely from our own diff.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Tycho Andersen
e60f9d3946 projects: run check-kernel-config.sh at kernel build time
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Tycho Andersen
b97bb70cda check-kernel-config: allow config file as an argument
This way we can run it on generated configs at kernel build time, too.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Justin Cormack
a5db0a22fd Merge pull request #1875 from justincormack/report-22-may
Add development report for 22 May 2017
2017-05-22 22:11:40 +01:00
Justin Cormack
a99a3ad3cf Add development report for 22 May 2017
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-22 21:49:33 +01:00
Riyaz Faizullabhoy
4a61d0bb9d Merge pull request #1874 from estesp/sig-time-update
Add time and announce info to security SIG report
2017-05-22 11:32:17 -07:00
Phil Estes
455ddb5812
Add time and announce info to security SIG report
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-05-22 14:01:26 -04:00
Rolf Neugebauer
6b937b37d5 Merge pull request #1870 from rneugeba/kernup
kernel: Update to 4.11.2/4.10.17/4.9.29/4.4.69
2017-05-22 15:25:01 +01:00
Rolf Neugebauer
608fbb3f15 Merge pull request #1869 from rneugeba/test
Various improvements to tests
2017-05-22 15:08:36 +01:00
Justin Cormack
11dfad05d6 Merge pull request #1871 from justincormack/qemu-img-container-fix
Fixes for running qemu-img in a container
2017-05-22 15:01:42 +01:00
Rolf Neugebauer
c1902f7157 tests: Fix qemu test for EFI firmware
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-22 14:44:56 +01:00
Rolf Neugebauer
822d179a2b tests: Add initial hyperkit tun test
This uses 'expect' instead of 'grep' because hyperkit is
a bit finicky with re-directing the output (it expects a
tty). 'expect' handles this and is installed on macOS by
default.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-22 14:44:56 +01:00
Rolf Neugebauer
e62e94a240 tests: Run config tests on all kernels we support
- Add a test for the kernel config for each supported kernel
- simplify YAML files: no need for ca certificates nor DHCP
- Explicitly state that the kernel module tests are for
  the 4.9 kernel.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-22 14:44:56 +01:00
Rolf Neugebauer
e1920b4f22 tests: Add a test for running qemu in a container
The qemu backend defaults to running against a locally installed
qemu but falls back to running in a container if qemu is not
installed. This test explicitly tests that the containerised
qemu backend works only if there is a locally installed qemu.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-22 14:44:56 +01:00
Rolf Neugebauer
0fa440938a tests: Fix cleanup for qemu tests
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-22 14:44:55 +01:00
Justin Cormack
389e776676 Update moby tool
This now supports setting `source:` in the `files` section to read the contents of
a file rather than specifying it inline.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-22 14:44:55 +01:00
Justin Cormack
8afd318e97 Fixes for running qemu-img in a container
- show errors by outputting stderr
- as no input is wired up, fails as requests a tty, so don't do that

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-22 14:36:00 +01:00
Rolf Neugebauer
6f394920a7 kernel: Update to 4.11.2/4.10.17/4.9.29/4.4.69
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-22 13:59:03 +01:00
Justin Cormack
f7ae7e3c2a Merge pull request #1868 from justincormack/mobyup
Update moby tool
2017-05-22 11:59:39 +01:00
Justin Cormack
0398d208dc Merge pull request #1867 from justincormack/qemu-disk-format
Allow specifying the format of a qemu drive
2017-05-22 11:51:04 +01:00