Commit Graph

4748 Commits

Author SHA1 Message Date
Rolf Neugebauer
a9538a57d4 tests: Tidy up the format_mount tests
- Consistently use env variables
- Use simpler cleanup code

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-18 13:51:16 +01:00
Rolf Neugebauer
59a085efc0 tests: Clean-up and fix extend tests
- Consistently use env variables for names
- Make sure temporary files are removed (the 'create'
  images were left behind)

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-18 13:51:16 +01:00
Rolf Neugebauer
4541e8511a tests: Unify test YAML files to test.yml
While at it also unify the clean-up code and other bits in test.sh

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-18 13:51:16 +01:00
Rolf Neugebauer
6842f10351 tests: Clean up build tests
Build tests don't need the 'find' nor 'rm -r' as they don't
create directories.

There is no need to delete the 'test.yml' file in
the output tests.

Consistently use NAME as the name argument

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-18 13:51:16 +01:00
Rolf Neugebauer
27839280f7 build: Update rtf to the latest version
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-18 13:51:16 +01:00
Rolf Neugebauer
ac18bbfda0 Merge pull request #2514 from matjohn2/zfs-depmod-fix
Ensure depmod is run on ZFS module builds (fixes ZFS modprobe)
2017-09-18 11:31:15 +01:00
Matt Johnson
fdc1c0edc8 Enable modprobe zfs by running depmod on the new kernel build.
Depmod in the zfs makefiles will never run as `/boot/` and relevant map files dont exist in our build environments.
Included style suggestions by @rn

Signed-off-by: Matt Johnson <matjohn2@cisco.com>
2017-09-18 08:55:17 +01:00
Rolf Neugebauer
cf2d88bb83 Merge pull request #2515 from eyz/open-vm-tools-poweroff
added support for guest shut down in pkg/open-vm-tools
2017-09-17 22:02:50 +01:00
Isaac Rodman
38452aa742 added poweroff.sh for pkg/open-vm-tools to allow shutdown from hypervisor
Signed-off-by: Isaac Rodman <isaac@eyz.us>
2017-09-16 10:39:23 -07:00
Rolf Neugebauer
6845f602dc Merge pull request #2506 from eyz/master
new pkg/modprobe from linuxkit/alpine base onto scratch
2017-09-16 17:21:15 +01:00
Rolf Neugebauer
d38ea16f4a Merge pull request #2513 from rn/lcow-kernel
Update 4.12.13 kernel patches and use it for LCOW
2017-09-15 21:41:44 +01:00
Isaac Rodman
0cce316caa pkg/modprobe from linuxkit/alpine base, using established multistage build onto scratch pattern
Signed-off-by: Isaac Rodman <isaac@eyz.us>
2017-09-15 12:38:40 -07:00
Justin Cormack
9d55b197c0 Merge pull request #2483 from zx2c4/custom-wg-script
wireguard: use custom wg-quick
2017-09-15 09:51:54 -07:00
Rolf Neugebauer
f547ac7259 blueprint: Update LCOW blueprint
- Use the new 4.12.13 kernel as it now seems to work
- Update LCOW to latest rev of OpenGCS

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-15 14:50:23 +01:00
Rolf Neugebauer
adb92ca672 pkg/init-lcow: Update to the latest version
This includes fixes to the intermittent on pull as well as
other fixes.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-15 14:47:12 +01:00
Rolf Neugebauer
7ba00c001b kernel: Update 4.12.x kernel patches
These are the recommended patches for 4.12 for Hyper-V sockets
and LCOW. Based on: https://github.com/Microsoft/opengcs/pull/138

This also includes a cherry-pick from upstream which fixes the
ext4/nvdimm/pax failures we have seen since 4.11.2.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-15 14:46:25 +01:00
Jason A. Donenfeld
8f3847e985 wireguard: use custom wg-quick
This removes things we do not need and expects the interface to
already be created.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-09-15 01:01:55 +02:00
Rolf Neugebauer
0968be802f Merge pull request #2508 from rn/kern-up
kernel update to 4.12.13/4.9.50/4.4.88
2017-09-14 20:54:11 +01:00
Rolf Neugebauer
2d20ef1014 Update YAML files to new kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-14 17:21:01 +01:00
Rolf Neugebauer
59782d502e kernel: Update to 4.12.13/4.9.50/4.4.88
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-14 17:19:43 +01:00
Rolf Neugebauer
7ac06c5ad4 Merge pull request #2507 from djs55/fix-logging
service: log stdout and stderr to separate files
2017-09-14 13:23:26 +01:00
David Scott
2b80ff5a0f Update init version in YAML files
Signed-off-by: David Scott <dave.scott@docker.com>
2017-09-14 11:47:38 +01:00
David Scott
9c35dbaac2 service: log stdout and stderr to separate files
Previously we would pass the path `/var/log/service.log` for both
stdout and stderr to containerd. containerd would construct a dict
with the paths as keys[1] and, due to the duplicate key, would only
open one of the files and start one `io.Copy` instance. Writes to
the other stream would be buffered by the pipe connected to
containerd-shim and would eventually block.

If we modified containerd to open the file twice and start 2
`io.Copy` instances, we would end up with the two streams interleaved
together. It seems cleaner to keep the streams separate; therefore
this patch logs stdout to `/var/log/service.out.log` and stderr to
`/var/log/service.err.log`.

[1]
49437711c3/linux/shim/io.go (L51)

Signed-off-by: David Scott <dave.scott@docker.com>
2017-09-14 11:15:04 +01:00
Rolf Neugebauer
3b097e6056 Merge pull request #2504 from rn/lcow-up
Update OpenGCS and LCOW blueprint
2017-09-12 20:11:59 +01:00
Rolf Neugebauer
eb874e8078 blueprints: Open LCOW blueprint to latest
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-12 17:46:43 +01:00
Rolf Neugebauer
36c84004a2 pkg/init-lcow: Update to latest version of OpenGCS
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-12 16:59:07 +01:00
Justin Cormack
0125a95879 Merge pull request #2502 from rn/kern-up
Update kernel to 4.12.12/4.9.49 and enable TASK_XACCT/TASK_IO_ACCOUNTING
2017-09-12 15:06:36 +01:00
Rolf Neugebauer
95a1c51d0d Merge pull request #2501 from ijc/qemu-reinstate-persistent-mac
qemu: restore persistent mac address support
2017-09-12 13:39:18 +01:00
Ian Campbell
16147a7591 qemu: restore persistent mac address support
If the state dir is preserved then the VM should come up with the same mac
address on subsequent reboots.

Fixes regression in #2498.

Rather than fixing the typo in the associated comments just remove them since
they don't really convey any useful information.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-12 12:12:03 +01:00
Rolf Neugebauer
11d9dc1e99 Update YAML files to latest kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-12 11:49:52 +01:00
Rolf Neugebauer
3ed92e7497 kernel: Enable TASK_XACCT and TASK_IO_ACCOUNTING
This enables per task (IO) accounting which is useful
for monitoring IO activity and the like.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-12 11:47:05 +01:00
Rolf Neugebauer
7bc93a6c46 kernel: Update to 4,9.49/4.12.12
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-12 11:23:41 +01:00
Justin Cormack
ca4ee13fca Merge pull request #2499 from zx2c4/wireguard-bump
wireguard: bump to new snapshot with better RTS semantics
2017-09-11 20:51:34 +02:00
Jason A. Donenfeld
7fa39b172e wireguard: bump to new snapshot with better RTS semantics
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-09-11 18:46:07 +02:00
Justin Cormack
e3fbef6037 Merge pull request #2493 from rn/kup
Update kernels to 4.12.10/4.12.11/4.9.48/4.4.87
2017-09-11 11:18:41 +02:00
Rolf Neugebauer
7c78352a74 Merge pull request #2498 from arm64b/arm64-qemu-networking-tap
qemu: Fix the networking issue in 'tap' mode on arm64
2017-09-11 09:47:12 +01:00
Dennis Chen
147964b241 qemu: Fix the networking issue in 'tap' mode on arm64
This PR is used to fix the issue #2488.

Currently we use '-net' the old way to initialize a host nic
interface, this method will not work on arm64 platform(#2488 issue),
so we use the '-netdev' method which will work on both arm64 and amd64.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-09-11 05:33:06 +00:00
Rolf Neugebauer
61c74e2e72 Merge pull request #2494 from rn/qarm64
cmd: On KVM/aarch64 add gic_version=host
2017-09-08 18:50:59 +01:00
Rolf Neugebauer
57394620b8 cmd: On KVM/aarch64 add gic_version=host
This picks the correct GIC version to be emulated.
Without it you get an error on Thunder-X (and possibly others):

KVM_SET_DEVICE_ATTR failed: No such device

See also https://bugzilla.redhat.com/show_bug.cgi?id=1375571#c6

Fixes #2360

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-08 16:34:33 +01:00
Rolf Neugebauer
a1dcdd6495 Update YAML files with latest kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-08 15:46:02 +01:00
Rolf Neugebauer
5427147e3b kernel: Update to 4.12.11/4.9.48/4.4.87
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-08 14:44:44 +01:00
Rolf Neugebauer
c6af2f4d6b kernel: Update to 4.12.10
I must have missed the update earlier this week

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-08 14:08:04 +01:00
Rolf Neugebauer
c89af36c36 Merge pull request #2475 from rn/zfs
Add support for building ZFS kernel modules
2017-09-08 10:35:56 +01:00
Rolf Neugebauer
c19f6e99dc Merge pull request #2491 from rn/lcow-linux-v4.11.1
Use Linux kernel 4.11.1 for LCOW for now
2017-09-07 22:05:48 +01:00
Rolf Neugebauer
792f4030c9 Merge pull request #2492 from ijc/containerd-v1.0.0-beta.0
Containerd v1.0.0 beta.0
2017-09-07 22:02:04 +01:00
Ian Campbell
b7ec19bb1f Update yml for containerd beta.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-07 18:46:40 +01:00
Ian Campbell
6cbc3ed518 Bump init+containerd to new alpine base with containerd beta.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-07 18:31:57 +01:00
Ian Campbell
b736afeee3 alpine: bump to containerd v1.0.0-beta.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-07 17:28:38 +00:00
Rolf Neugebauer
b9ff4e536d blueprints: Use kernel 4.11.1 for LCOW (for now)
Newer 4.11.x kernels seem to trigger a bug (either in Linux or the
NVDIMM backend in Hyper-V) which causes silent failures of the
container VM.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-07 18:02:08 +01:00
Rolf Neugebauer
ce9054efdb kernel: Remove 4.11 support (again!)
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-07 17:55:43 +01:00