Commit Graph

4850 Commits

Author SHA1 Message Date
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
Rolf Neugebauer
4036e71c0d kernel: Temporarily revert 4.11.x to 4.11.1 on x86_64
Commit 5a3651b4a92c ("ext4: return to starting transaction in
ext4_dax_huge_fault()") introduced between 4.11.1 and 4.11.2
causes LCOW to stop working (VM silently exits). It is unclear
if this commit is the root cause or if it triggers something
in the Hyper-V backend or if it is unrelated.

But, in order make progress on other LCOW testing, we temporarily
use need to use this older kernel untile the issue has been
root caused.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-07 17:37:00 +01:00
Rolf Neugebauer
997a0a4756 kernel: Add additional patch to 4.11 kernel
This is required for LCOW, see:
https://github.com/Microsoft/opengcs/pull/127/files#diff-6de848311cf35e3295214a8d10e3142cR62

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
(cherry picked from commit 38a2d57dc8)
2017-09-07 17:34:38 +01:00
Rolf Neugebauer
5325984124 kernel: Temporarily resurrect the 4.11 kernel
We need to apply an additional patch for LCOW.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
(cherry picked from commit 66d96b4749)
2017-09-07 17:34:38 +01:00
Rolf Neugebauer
c793ea973c Merge pull request #2490 from MagnusS/update-vpnkit
Update to latest Hyperkit API
2017-09-07 17:08:53 +01:00
Magnus Skjegstad
c8ba942a80 Update to new Hyperkit API / VPNKit protocol
This adds support for the updated Hyperkit API, which is needed to
request a specific IP address in new versions of VPNKit / Docker for
Mac. IPs encoded in the UUID (the old method) will now be ignored by
VPNKit.

A preferred IPv4 address can be requested directly via the new API. The
IP is then associated with the VPNKit UUID identifying the connection.
The UUID is either user specified or randomly assigned if left empty.
VMs launched with the same VPNKit UUID it will get the same IP address.

To avoid having to copy the assigned UUID manually, a file `uuid.vpnkit`
is now saved in the state directory when the UUID is generated.  The UUID
from this file is reused automatically if it exists, unless a different
VPNKit UUID is specified on the command line. This also means that VMs
that use dynamically assigned IPs will by default get the same IP each
time they are started, as long as the state directory exists.

This change is incompatible with earlier versions of VPNKit / Hyperkit
and a recent version of Docker for Mac has to be installed. If the
feature is unsupported using the `--ip` parameter will exit with an
error message.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-09-07 12:15:49 +02:00
Magnus Skjegstad
241136e910 Update Hyperkit to latest version
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-09-07 10:49:45 +02:00
Riyaz Faizullabhoy
ce829e3878 Merge pull request #2486 from rn/lcow
Update LCOW
2017-09-06 11:19:42 -07:00
Ian Campbell
8e26838ed8 Merge pull request #2449 from djs55/docker-for-mac-files
docker-for-mac: supply the daemon.json via metadata
2017-09-06 18:39:49 +01:00
Rolf Neugebauer
5865a1aff3 doc: Add some notes on ZFS
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-06 15:44:41 +01:00
Rolf Neugebauer
8d45a96f34 kernel: Add zfs kmod build to the kernel build
This adds building the zfs-kmod package to the kernel build.
The zfs-kmod packages contains the matching ZFS kernel modules
for a given kernel in /lib/modules/$(uname -r)/extra.

The zfs-kmod package also contains the standard kernel modules
and depmod is run over them so that modprobe works

The zfs-kmod package is not build by default due to unclarity
about licenses. Users will have to build it themselves.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-06 15:32:12 +01:00
Rolf Neugebauer
c9ead45731 kernel: Add Dockerfile to compile the ZFS kernel module
Note this is not the latest ZFS version but the version matched
by the current alpine zfs utilities.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-06 15:32:12 +01:00
Rolf Neugebauer
a739e24cd1 blueprints: Update LCOW to latest init-lcow
Also explicitly specify the new kernel 4.11.12 kernel with
updated patches.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-06 08:54:14 +01:00
Rolf Neugebauer
3ebec6f3e8 pkg/init-lcow: Update to latest OpenGCS version
While at it also update to latest alpine base

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-06 08:54:14 +01:00
Rolf Neugebauer
a46d51bdcd kernel: Remove 4.11 kernel again
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-06 08:54:14 +01:00
Rolf Neugebauer
38a2d57dc8 kernel: Add additional patch to 4.11 kernel
This is required for LCOW, see:
https://github.com/Microsoft/opengcs/pull/127/files#diff-6de848311cf35e3295214a8d10e3142cR62

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-06 08:54:14 +01:00
Rolf Neugebauer
66d96b4749 kernel: Temporarily resurrect the 4.11 kernel
We need to apply an additional patch for LCOW.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-06 08:54:14 +01:00
Rolf Neugebauer
54c2d6e61c Merge pull request #2482 from rn/kernels
Update kernels and enable iSCSI
2017-09-04 20:36:11 +01:00
Rolf Neugebauer
ed8d367e2a Update 4.9.x/4.4.x kernel version in YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-04 17:58:16 +01:00
Rolf Neugebauer
6da35660a9 kernel: Update kernel build to latest alpine base
Since we have to recompile kernels, might as well.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-04 17:58:16 +01:00
Rolf Neugebauer
1d33b90530 tools/alpine: Add iSCSI and related tools to base
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-04 17:58:16 +01:00
Rolf Neugebauer
8ce9ead839 kernel: Enable CGROUP_RDMA and CGROUP_BPF for 4.12 kernels
These are new options introduced with 4.11.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-04 17:58:16 +01:00
Rolf Neugebauer
a8839d91db kernel: Enable ISCSI_TCP and DM_MULTIPATH for all kernels
These are enabled as modules and are useful for iSCSI storage backends.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-04 17:58:16 +01:00
Rolf Neugebauer
8be4a2b2c4 kernel: Update to 4.9.47/4.4.86
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-04 17:58:16 +01:00
Justin Cormack
683aea3e07 Merge pull request #2480 from samoht/update-capnp
[miragesdk] Update to latest capnp & capnp-rpc & charrua
2017-09-04 17:02:09 +01:00
Thomas Gazagnaire
14a5b64dcc Update to latest capnp & capnp-rpc
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-09-04 16:21:53 +02:00
Justin Cormack
e27807b733 Merge pull request #2478 from justincormack/formats
Change "output" to "format" in moby tool
2017-09-02 12:00:13 +01:00
Justin Cormack
91207540e4 Change "output" to "format" in moby tool
This is less confusing as there is also an output option to set the file.

See https://github.com/moby/tool/pull/146

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-01 23:52:25 +01:00
Justin Cormack
e03ca107b8 Merge pull request #2477 from t-koulouris/ok_build
okernel: build dockerfile now gets openssl package from alpine base image
2017-09-01 16:59:58 +02:00
Theo Koulouris
1c14f278b2 okernel build dockerfile now gets openssl package from alpine base image
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
2017-09-01 14:26:00 +01:00
David Scott
b60ad02add docker-for-mac: AF_VSOCK port in README should be 948 (was 947)
Before:
    docker-for-mac djs$  docker -H unix://docker-for-mac-state/guest.00000947 ps
    Cannot connect to the Docker daemon at unix://docker-for-mac-state/guest.00000947. Is the docker daemon running?

After:
    docker-for-mac djs$  docker -H unix://docker-for-mac-state/guest.00000948 ps
    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES

Signed-off-by: David Scott <dave.scott@docker.com>
2017-09-01 11:41:44 +01:00
David Scott
af5761d6b5 docker-for-mac: use runtime: mkdir
This replaces an alpine container which existed only to run the `mkdir`.

Signed-off-by: David Scott <dave.scott@docker.com>
2017-09-01 11:41:44 +01:00
David Scott
c29b433780 docker-for-mac: add certificates
This fixes the error starting the `metadata` package, as described in

Signed-off-by: David Scott <dave.scott@docker.com>
2017-09-01 11:41:44 +01:00
David Scott
25a05142a3 docker-for-mac: supply the daemon.json via metadata
Previously the docker-for-mac example had a `files` declaration
which wrote `/var/config/docker/daemon.json`. This was probably an
error because the `/var/config` directory is owned by the `metadata`
package. It used to work -- probably by accident -- but doesn't
any more.

This patch switches to using the metadata package to populate the
`daemon.json`.

Signed-off-by: David Scott <dave.scott@docker.com>
2017-09-01 11:41:08 +01:00
Rolf Neugebauer
c07309b700 Merge pull request #2472 from rn/base
tools: Add openssl, attr-dev, and libtirpc-dev to the alpine base image
2017-08-31 18:53:23 +01:00
Riyaz Faizullabhoy
574fdb1a1b Merge pull request #2471 from rn/kmod-test
Remove user/references to linuxkit/kernel-compile
2017-08-31 09:45:24 -07:00
Riyaz Faizullabhoy
fb8a1bf39f Merge pull request #2464 from rn/dock-up
Update DinD from 17.06.1-ce to 17.07.0-ce
2017-08-31 09:43:53 -07:00
Riyaz Faizullabhoy
4c9158b714 Merge pull request #2470 from rn/auth
Update authors file with recent contributors
2017-08-31 09:42:33 -07:00
Rolf Neugebauer
db6e8bae35 tools: Add openssl, attr-dev, and libtirpc-dev to the alpine base image
The first is needed by the okernel project and last two to run
configure on the zfs kernel modules.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-31 15:54:12 +00:00
Rolf Neugebauer
2d1242e271 Merge pull request #2465 from t-koulouris/ok_build_updates
Updates to okernel project build files
2017-08-31 15:47:22 +01:00
Rolf Neugebauer
608ab6ccf1 docs: Remove reference to linuxkit/kernel-compile
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-31 15:25:41 +01:00
Rolf Neugebauer
f67cb4719a test: Remove kernel-compile from kmod test
linuxkit/kernel-compile is no longer maintained. Use
the alpine base image instead.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-31 15:21:27 +01:00
Rolf Neugebauer
e26430cfe7 Update authors file with recent contributors
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-31 15:04:18 +01:00
Theo Koulouris
27e8c1145c Streamlined how Makefile handles okernel versions
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
2017-08-31 14:31:41 +01:00
Theo Koulouris
c51f89a600 Removed unused device drivers and options from okernel config file
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
2017-08-31 13:43:39 +01:00
Theo Koulouris
88a2415ff5 Stop using deprecated linuxkit/kernel-compile in okernel build Dockerfile
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
2017-08-31 13:42:07 +01:00
Rolf Neugebauer
fe1aa4659c Merge pull request #2467 from rn/kern-up2
Update kernels to 4.12.9/4.9.45/4.9.46/4.4.84/4.4.85
2017-08-31 10:46:22 +01:00
Rolf Neugebauer
15c9bc1144 Merge pull request #2468 from rn/lcow-up
Update LCOW to latest OpenGCS rev
2017-08-30 21:04:33 +01:00
Rolf Neugebauer
bd2c9f8b63 blueprints: Update LCOW blueprint
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-30 19:41:02 +01:00