Trying to find the relevant yaml file was an issue as we now support
`--name` and it might be in a different directory, so although it is
a bit verbose outputing a whole file at least it is more consistent.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Currently if you just do `make` the hyperkit executables won't get
put in `bin/`, so try to extract from OSX.
This is temporary until get a better runner, but makes it nicer after `make clean`.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This is all slightly annoying, maybe we should make a file for the CLI for
hyperkit, but this is better and fixes a bug that the test CLI was coming from moby,
and is easier to use with custom builds.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Passing accel=kvm:tcg causes it to try KVM first if available with a fallback
to TCG (emulated/JIT mode) if it is not available. With this the boot logs gain:
+Hypervisor detected: KVM
and also
-Booting paravirtualized kernel on bare hardware
+Booting paravirtualized kernel on KVM
Among various other noise.
If I rename my host /dev/kvm then this is reversed, although with the following
message:
Could not access KVM kernel module: No such file or directory
failed to initialize KVM: No such file or directory
Back to tcg accelerator.
Q35 is a more modern emulated platform based on the ICH9 host chipset rather
than the default "pc" I440FX (Pentium Pro / Pentium II era) emulation. See
http://wiki.qemu-project.org/Features/Q35 for more info. Switching to Q35 is
not a requirement for enabling KVM but seemed like a reasonable change.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
- remove remainder of editions code
- add a new check container to run tests without Docker
- switch over `make test` to use new command to build tests
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
In d4m.sh line 14:
(cd $DB && \
^-- SC2086: Double quote to prevent globbing and word splitting.
In d4m.sh line 21:
(cd $DB; git reset --hard)
^-- SC2086: Double quote to prevent globbing and word splitting.
In d4m.sh line 22:
if [ -f ${DB}/${DB_BRIDGE} ]; then
^-- SC2086: Double quote to prevent globbing and word splitting.
In d4m.sh line 23:
content=$(cat ${DB}/${DB_BRIDGE})
^-- SC2086: Double quote to prevent globbing and word splitting.
In d4m.sh line 24:
[ ${content} != "1" ] && enable_bridge
^-- SC2086: Double quote to prevent globbing and word splitting.
In d4m.sh line 34:
dd if=/dev/zero of=$DISK bs=1048576 count=256
^-- SC2086: Double quote to prevent globbing and word splitting.
Signed-off-by: Tycho Andersen <tycho@docker.com>
Recently com.docker.slirp was renamed.
Please update Docker for Mac before using this script...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
On OSX the system version uses `m` but `brew` will install a version
that only understands `M`...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
We want be able to build kernels for different archs without that they
clash with each other so we but the generated files into an $arch subdir.
Signed-off-by: Natanael Copa <natanael.copa@docker.com>
