Commit Graph

3391 Commits

Author SHA1 Message Date
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
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
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
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
Justin Cormack
f5cd9a41ed 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 11:31:05 +01:00
Justin Cormack
809213230d Allow specifying the format of a qemu drive
Default remains qcow2 but you can specify raw or other supported formats.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-22 11:16:20 +01:00
Rolf Neugebauer
a6d834ddf0 Merge pull request #1865 from justincormack/go-compile
more Go compile fixes
2017-05-21 11:18:45 +01:00
Rolf Neugebauer
4377ae3209 Merge pull request #1861 from justincormack/containerd-build
Update containerd
2017-05-21 11:13:07 +01:00
Justin Cormack
e52bf2f745 Update sysctl and sysfs in yaml files
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-20 11:16:48 +01:00
Justin Cormack
f7cc10890d Update sysfs in line with sysctl
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-20 11:05:59 +01:00
Justin Cormack
e4d7e0b90c Update alpine for sysctl, remove gitignore
Minor cleanup

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-20 11:02:12 +01:00
Justin Cormack
e3a4a88e73 Update alpine package
- minor cleanup
- remove cross compile support from go-compile script as not needed

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-20 10:59:31 +01:00
Justin Cormack
fc69bcf288 Partially fix Windows build with go-compile
Fix go-compile to not use buildmode pie for Windows.

See #1863

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-20 10:57:48 +01:00
Justin Cormack
a81a48629b Merge pull request #1862 from justincormack/label-support
Label support
2017-05-20 10:31:48 +01:00
Justin Cormack
56121a774b Add label for poweroff container to simplify tests
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 22:05:15 +01:00
Justin Cormack
4d4598e784 Use labels for the test-sysctl image
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 22:05:15 +01:00
Justin Cormack
702ad5d9d9 Update git hashes for sysctl
And remove all the config options as they are now in the label.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 22:05:15 +01:00
Justin Cormack
07a8ceb9c9 Update moby tool to support config in labels
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 22:05:15 +01:00
Justin Cormack
4b30328c74 Add label to sysctl image
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 22:05:15 +01:00
Justin Cormack
345a294b5e Add a test case for the sysctl package
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 22:05:08 +01:00
Justin Cormack
e12b5a36ba Convert sysctl to using linuxkit/alpine and nested build
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 14:23:06 +01:00