Commit Graph

3170 Commits

Author SHA1 Message Date
Avi Deitcher
ff7de6e532 Add docs on how to use external disk
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-05-08 14:47:45 -04:00
Rolf Neugebauer
f3157af1db Merge pull request #1655 from dave-tucker/test-cleanup
Clean up the tests
2017-05-05 13:56:14 +01:00
Dave Tucker
16cfd3ea2d tests: Rename kernel-config image to test-kernel-config
Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-05 11:51:10 +01:00
Dave Tucker
e4d84cf304 tests: add makefile for tests
this removes all test targets from the top level makefile with the
exception of `make test` that now calls `$(MAKE) -C test`.

all tests now use `moby run` by instead of the older `./scripts`.
this removes the need for dedicated qemu/hyperkit test targets.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-05 11:01:09 +01:00
Dave Tucker
fb4d621833 tests: use the poweroff pkg in test-kernel-config
Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-04 23:56:40 +01:00
Dave Tucker
05767273f3 tests: cleanup test directory
- add a `pkg` directory for packages
- add a `cases` directory for yml files

Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-04 23:56:40 +01:00
Justin Cormack
edb909567c Merge pull request #1772 from rneugeba/pkg
Update packages
2017-05-04 23:11:52 +01:00
Rolf Neugebauer
21f1646ce2 Update YAML files with new package hashes
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Rolf Neugebauer
17adcefe6c pkg: Convert openntpd to use the Alpine base image and git tree hash
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Rolf Neugebauer
41a1d16694 pkg: Use git tree hash for the prometheus node_exporter
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Rolf Neugebauer
1748a69f2a pkg: Convert mount to use the Alpine base and git tree hash
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Rolf Neugebauer
fce13fb48d pkg: Convert format to use the Alpine base and git tree hash
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Rolf Neugebauer
43d97967ef pkg: Convert docker-ce to use the Alpine base and git tree hash
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Rolf Neugebauer
e929205c31 pkg: Convert dhcpcd to use the Alpine base image and git tree hash
This builds the dhcpcd package from a fixed Alpine 3.5 base and adds
the dhcpcd daemon from the Alpine base image. This should make the
build reproducible and allows us to use the git tree hash.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Rolf Neugebauer
aea6d6c54e pkg: Convert binfmt to use the Alpine base image and git tree hash
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Justin Cormack
6deddf749c Merge pull request #1770 from justincormack/cleanup
Fix make clean to remove new -kernel files
2017-05-04 16:34:44 +01:00
Justin Cormack
9eaf89da47 Merge pull request #1764 from dave-tucker/artifacts
Makefile: gather all build artifacts in one location
2017-05-04 16:34:29 +01:00
Justin Cormack
0c53e88be5 Fix make clean to remove new -kernel files
Missed this in the changeover

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-04 16:03:20 +01:00
Dave Tucker
8610716be1 Makefile: gather all build artifacts in one location
This makes it easier for CI to grab artifacts from the ephemeral build
VMs and provides a stable location so they can be used in subsequent
tests. For example, running the LTP tests.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-04 12:08:31 +01:00
Rolf Neugebauer
9dead59989 Merge pull request #1769 from rneugeba/kern-up
kernel: Update to 4.4.66/4.9.26/4.10.14
2017-05-04 11:13:47 +01:00
Rolf Neugebauer
566bb2a1f0 kernel: Update to 4.4.66/4.9.26/4.10.14
This also adds the cherry-picked commit f1c635b439a5c017 ("scsi: storvsc: Workaround
for virtual DVD SCSI version") from 4.11 for the 4.9 and 4.10 kernels. This commit
fixes a crash/memory leak on Hyper-V when no disk drives are attached and if one
boots of a CD-ROM drive.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 10:58:32 +01:00
Justin Cormack
81c3b92a7a Merge pull request #1766 from ndauten/ndauten-patch-1
Spelling error: Dautenhan -> Dautenhahn
2017-05-03 19:15:39 +01:00
Nathan Dautenhahn
f8f9ed9965 Spelling error: Dautenhan -> Dautenhahn
Signed-off-by: Nathan Dautenhahn <ndd@cis.upenn.edu>
2017-05-03 14:04:29 -04:00
Rolf Neugebauer
ba6c210029 Merge pull request #1765 from rneugeba/kmod
Add support for building custom kernel modules
2017-05-03 17:06:49 +01:00
Justin Cormack
861c70c0e4 Merge pull request #1763 from justincormack/alpine-base
Use Alpine base image that includes packages
2017-05-03 16:55:54 +01:00
Rolf Neugebauer
c9c0c16490 docs: Add a section on how to compile kernel modules
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-03 16:46:12 +01:00
Rolf Neugebauer
6cfadcd26e test: Add a simple test/example for compiling a kernel module
The test is currently not hooked up, but it pulls the latest 4.9.x
kernel image, builds a simple kernel module against it and then creates
a test package containing the kernel module and a shell script.

The shell script prints out the 'modinfo' and then tries to 'insmod'
the module. It checks the output of 'dmesg' of the load succeeded.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-03 16:46:12 +01:00
Rolf Neugebauer
ffc0ed6a7c kernel: Fix kernel header build
Add more files to 'kernel-dev.tar' to enable building kernel
modules against the kernel.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-03 16:46:12 +01:00
Justin Cormack
3bd53067fb Update yaml files with new ca-certificates
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-03 16:43:24 +01:00
Justin Cormack
26f7d6ebdd Update ca-certificates to use new Alpine base image
This is what the other images should look like in future.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-03 16:42:28 +01:00
Justin Cormack
edfac0e8fb Add a base Alpine package that includes a package mirror
This means that we limit to one place where we use network access
in building, and in future all other package builds can be deterministic.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-03 16:29:53 +01:00
Justin Cormack
7698d1c344 Merge pull request #1762 from justincormack/remove-base
Remove unused mkimage-base
2017-05-03 14:38:45 +01:00
Justin Cormack
fa90764b55 Remove unused mkimage-base
We have not used this for ages, we use Go code in `moby` tool to
do this now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-03 14:27:05 +01:00
Rolf Neugebauer
6c2974d49d Merge pull request #1756 from ijc25/kubernetes
projects/kubernetes: Fixup boot-*.sh
2017-05-03 09:30:58 +01:00
Ian Campbell
bb50dd9781 projects/kubernetes: Allow linuxkit to pick default backend
Drop `hyperkit` from the `linuxkit run` invocation, thus causing the linuxkit
tool to pick the platform's default backend (which is qemu on my Linux system,
which works better than hyperkit in this environment).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-03 09:11:32 +01:00
Justin Cormack
0325cbe1ec Merge pull request #1758 from rneugeba/qemu
cmd: Unify 'run' cmdline options
2017-05-02 17:16:10 +01:00
Rolf Neugebauer
d2bdd94054 Merge pull request #1757 from rneugeba/kbuild
Update kernel build (and update to 4.4.65)
2017-05-02 17:03:44 +01:00
Rolf Neugebauer
5ce03cc884 cmd: Unify 'run' cmdline options
- Use 'disk-size' for disk size
- Use 'disk' for the path to the disk image
- Use 'fw' for the path to the EFI firmware

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-02 17:00:57 +01:00
Justin Cormack
3406d33d7f Merge pull request #1753 from dave-tucker/ci-fixes
Fix CI
2017-05-02 16:52:46 +01:00
Rolf Neugebauer
c9a123ba54 kernel: Update to 4.4.65
The 4.9 and 4.10 series did not get updates

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-02 15:20:04 +01:00
Justin Cormack
777eecde89 Merge pull request #1754 from justincormack/docker-clean
Adjust docker-ce package
2017-05-02 14:49:11 +01:00
Justin Cormack
a37fd19f88 Adjust docker-ce package
Bring it into line with official images: remove `jq`, `sfdisk` which
are not needed; we used them for disk mounting but this is down standalone.
Add the tools for other filesystems, which are needed for `dm`, `btrfs`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-02 14:37:04 +01:00
Rolf Neugebauer
f44421042e kernel: Fix DEBUG builds and add default debug targets/images
Building debug kernels (with additional run time checks and debugging)
was broken a few commits back. This adds back support for building debug
kernels.

In addition, it builds and uploads debug kernels for selected kernel
series (4.9.x LTS and latest stable). The tag for these kernels has
a "_dbg" suffix.

Update documentation.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-02 14:17:01 +01:00
Dave Tucker
cda03f7e0d Makefile: Use the name provided to upload in run
This fixes an issue introduced in the split of push and run.
Before this commit, an image could be pushed to a custom location from
the presence of the `CLOUDSDK_IMAGE_NAME` variable. The subsquent run
would fail as the name `test-ltp` or `test` had been hard coded in the
Make target. We now use a target-specific variable which is only set if
there is not an existing variable in the environment

Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-02 12:38:27 +01:00
Dave Tucker
ccfbcceebd linuxkit: Make gcp push honour the img-name flag
This fixes a regression where `linuxkit push gcp` no longer allows for a
custom destination to be provided via the `-img-name` flag or the
`CLOUDSDK_IMAGE_NAME` environment variable

Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-02 12:36:09 +01:00
Rolf Neugebauer
5ab5f31e14 kernel: Simplify/restructure Dockerfile
- Use a RUN command per artefact created
- Use WORKDIR to avoid "cd /linux" on every RUN command
- Copy all relevant build artefacts to /out
- Only create one additional layer in final stage
- Add System.map to output image

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-02 10:33:45 +01:00
Justin Cormack
34d508562d Merge pull request #1749 from justincormack/report-30-april
Development report for 30 April 2017
2017-05-01 13:25:37 +01:00
Justin Cormack
c31fb17c81 Merge pull request #1748 from justincormack/empty-base
Remove stray .gitignore in base/
2017-05-01 12:34:08 +01:00
Justin Cormack
b99bebdf22 Merge pull request #1750 from solidnerd/fix-typo-kernel-md
Fix typo in docs/kernels.md
2017-05-01 12:33:58 +01:00
Justin Cormack
73c399ae9b Development report for 30 April 2017
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-01 12:33:33 +01:00