Commit Graph

3346 Commits

Author SHA1 Message Date
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
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
Rolf Neugebauer
d06ecc5f79 tools: Remove tini image
All users in ./pkg and ./test have been converted to use
tini from the alpine base image.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
91d267bcb5 test: Use tini from alpine base in the virtsock test package
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
ab5bb75642 pkg: Use tini from alpine base in rngd
This makes the package slightly bigger as tini from Alpine
is not statically linked but removes the dependency on
./tools/tini

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
e950d6e2ac pkg: Roll the sshd package from linuxkit/alpine
Also convert it to a multi-stage build and make
the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
9f6578783b pkg: Roll the swap package from linuxkit/alpine
Also convert to a multi-stage build and make the
make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
add7b63276 pkg: Roll the openntpd package from linuxkit/alpine
Also make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
7270e125d4 pkg: Roll the mount package from linuxkit/alpine
Also make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
e255bf1bf5 pkg: Roll the format package from linuxkit/alpine
Also make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
f5024e4baf pkg: Roll the docker-ce package from linuxkit/alpine
Also make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
92b8d873bf pkg: Roll the dhcpcd package from linuxkit/alpine
The dhcpcd package only needs a basic alpine-baselayout and
dhcpcd. This reduces the size of the package from 4.3MB to 1.8MB.

Also make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
72c88872e6 pkg: Roll the init package from linuxkit/alpine
We only need the alpine-baselayout packe to run init. This also
removes the sha256 import from alpine:edge.

This also reduces the size of the init package by more than
50% to just 1.5MB.

Also make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
c1a873b489 pkg: Update most packages to new alpine base
Also make the HUB org/registry build time configurable
for these packages.

Others will be reworked in sub sequent commits.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
98a99c6482 tools: Add packages to alpine base to create a base system
The added packages are necessary to create a base Alpine
container image and for converting more packages.

Update the versions file to the latest versions

Also make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Rolf Neugebauer
6ec971d10a Merge pull request #1854 from ijc25/qemu-runner-force-container
Allow forcing qemu backend to use container via command line
2017-05-18 18:03:12 +01:00
Ian Campbell
bb787b49be Allow forcing qemu backend to use container via command line
`linuxkit run --containerized foo`

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-18 17:19:01 +01:00
Justin Cormack
b0e506aa71 Merge pull request #1851 from riyazdf/sig-agenda-update
update SIG agenda with IMA namespace support
2017-05-18 14:35:16 +01:00
Riyaz Faizullabhoy
38e740b068 update SIG agenda with IMA namespace support
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-17 09:41:52 -07:00
Rolf Neugebauer
5fca56e356 Merge pull request #1830 from rneugeba/tests
Tidy up the tests
2017-05-17 15:14:55 +01:00
Rolf Neugebauer
cd354c2ab1 docs: Improve testing.md
- Add 'rtf list'
- Add section about test logs
- Fis a few typos

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
6fbbb4d756 test: Don't run 'rtf' in verbose mode
The detailed logs should be gathered by linuxkit-ci
and having the default output makes it easier to spot
which test failed.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
b03beb94ef tests: Add back the hack for running tests on GCP
These tests should be run via rtf but currently are
run via linuxkit-ci. This is a hack and hopefully is now
marked more clearly as such.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
509be016d2 tests: Remove LINUXKIT_ARTIFACTS_DIR from tests
This was a hack in the first place and will be replaced by
another, more obvious hack in the next commit.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
188ee6d226 tests: Delete README.md. It contained mostly inaccurate information
This should be replaced with more comprehensive documentation in
./doc/testing.md once the CI is fixed

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
316a40f20a tests: Sanity check when we run GCP tests
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
ddb4221c1f tests: Consolidate platform tests
There is no need to split the build from run as we have separate build tests

Also shuffle the order around a little. Double digit numbers are for local hypervisor
tests and tripple digit tests are for cloud.

Removed GCP test as they weren't run.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 14:46:28 +01:00
Rolf Neugebauer
e975d95b03 Merge pull request #1849 from rneugeba/kbuild
kernel: Add vmlinux to debug builds
2017-05-17 13:50:27 +01:00
Rolf Neugebauer
e6f2b68419 kernel: Add vmlinux to debug builds
The vmlinux image is the un-stripped kernel image containing
full debug information which is useful for kernel debugging.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-17 11:40:56 +01:00
Justin Cormack
fb856cbc1d Merge pull request #1844 from rneugeba/4.11-up
Update Hyper-V patches for 4.11 and add Hub org override for kernel builds
2017-05-16 17:23:57 +01:00
Rolf Neugebauer
4b50134bde kernel: Make the Docker Hub organisation configurable
For local testinf it is useful to store packages under a different
organisation on the hub (or indeed to select a different registry).
This is enabled by making the ORG configurable when calling make.

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