Commit Graph

3375 Commits

Author SHA1 Message Date
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
Justin Cormack
78728c281d Add go-compile script to linuxkit/alpine
This means Go code can use the same base image, which now includes Go tooling.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 14:22:12 +01:00
Justin Cormack
a3ea4646e5 Update containerd in yaml files
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 11:52:12 +01:00
Justin Cormack
c6e5ff83e0 Update containerd
- use new Makefile flags to add our build flags correctly now
- restore `dist` for now as it is useful for testing still, for now

Will remove both `dist` and `ctr` once we have our own tool, but will add
them to dev container instead.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 11:51:13 +01:00
Justin Cormack
ac31862c42 Merge pull request #1857 from tych0/add-ima-project
projects: add IMA namespacing project
2017-05-18 22:12:02 +01:00
Justin Cormack
c3d16e7289 Merge pull request #1858 from ijc25/remove-unused-vendoring
Remove unused packages from vendor.conf
2017-05-18 22:08:43 +01:00
Ian Campbell
c9293bf3ef Remove unused packages from vendor.conf
The actual code was removed in 4751d70b18 but
vendor.conf was not updated. Current version of vndr complains:

2017/05/18 21:18:03 WARNING: package github.com/docker/distribution is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package github.com/docker/engine-api is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package github.com/docker/go-connections is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package github.com/docker/go-units is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package github.com/opencontainers/runtime-spec is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package github.com/pkg/errors is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package github.com/xeipuuv/gojsonpointer is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package github.com/xeipuuv/gojsonreference is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package github.com/xeipuuv/gojsonschema is unused, consider removing it from vendor.conf
2017/05/18 21:18:03 WARNING: package gopkg.in/yaml.v2 is unused, consider removing it from vendor.conf

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-18 21:44:48 +01:00
Rolf Neugebauer
6c87043eed Merge pull request #1855 from ijc25/qemu-runner-use-tty
Pass `--tty` to `docker run` when running Qemu via a container
2017-05-18 21:41:48 +01:00
Ian Campbell
2df30ac26c Pass --tty to docker run when running Qemu via a container
Otherwise escape codes (arrow keys etc) do not work.

This is done only when stdin is a tty.

For clarity spell `--tty-` and `--interactive` out in full rather than using
the short versions.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-18 21:07:22 +01:00
Tycho Andersen
3fd6337a45 ima: use ima-utils package instead of new init
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-18 13:44:04 -06:00
Tycho Andersen
4b29c738e0 projects: add a blurb about ima namespacing
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-18 13:43:59 -06:00
Rolf Neugebauer
88b6077f9a Merge pull request #1856 from rneugeba/alpine-base
Update packages to use alpine base (plus other cleanups)
2017-05-18 19:47:28 +01:00
Tycho Andersen
d80e880f28 projects: add IMA namespacing project
This is a project with a v1 of the IMA namespacing patches. See the readme
for details on use.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-18 12:25:07 -06:00
Rolf Neugebauer
6bea56c185 Update all YAML files to use the new packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
d2c32e2e38 pkg: Make Hub org/repository build time configurable
Update the Makefiles of the remaining packages.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
b2eacf0f6c tools: Remove toybox. It's no longer used by any active packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
fbea0d9fd0 kernel: Remove toybox from kernel Dockerfile
You cna extract/inspect the contents with 'docker save' + 'tar'

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00