Commit Graph

2229 Commits

Author SHA1 Message Date
Tycho Andersen
437634cab1 better debugging output in some error cases
from:

2017/03/07 09:59:30 Failed to extract kernel image and tarball

to

2017/03/07 10:06:04 Failed to extract kernel image and tarball: Unable to find image 'mobylinux/kernel:7fa748810d7866797fd807a5682d5cb3c9c98111' locally

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-07 10:50:12 -08:00
Rolf Neugebauer
7b0bdd485e Merge pull request #1256 from rneugeba/infrakit
infrakit: Use the `moby` tool naming convention to select moby builds
2017-03-07 17:18:13 +00:00
Rolf Neugebauer
ba7a162603 infrakit: Use the moby tool naming convention to select moby builds
the `moby` tool uses a prefix for the build output. Specify the prefix
(and optional path) in the `Moby` property in the JSON instead of assuming
a different path for each initrd/kernel.

Also, adopt the new name for the kernel image (vmlinuz64 -> <prefix>-bzImage).

This should make it simpler to boot up hyperkit with Moby images
build from by the moby tool.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-07 16:09:26 +00:00
Rolf Neugebauer
118309b03f Merge pull request #1255 from rneugeba/infra-docs
infrakit: Update docs
2017-03-07 15:58:56 +00:00
Justin Cormack
fd19ca1a3c Merge pull request #1254 from rneugeba/patch-up
kernel: Update 4.9.x patches
2017-03-07 15:34:32 +00:00
Rolf Neugebauer
198599912d infrakit: Update docs
While at it, also simplify the JSON file

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-07 15:03:03 +00:00
Rolf Neugebauer
1041f95a6e kernel: Update 4.9.x patches
- Remove patch to prevent non-host network namespace to use VSOCK
  This is now handled by SECOMP profiles by docker
- rebase the VMBUS version cherry-picks to Linus' tree.
  This will make it easier to get them into stable

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-07 14:04:53 +00:00
Justin Cormack
ad70b0b742 Merge pull request #1253 from justincormack/docs
Add some more info about config file
2017-03-07 14:01:28 +00:00
Justin Cormack
e7ae5df69d Add some more info about config file
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 13:39:45 +00:00
Justin Cormack
24c7e6eeb6 Merge pull request #1252 from justincormack/cleanup
More cleanup
2017-03-07 13:09:03 +00:00
Justin Cormack
7d6de92700 More cleanup
- remove more editions code
- remove unused tool pad4
- add back whale to test output

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 13:05:53 +00:00
Justin Cormack
cf809a6eb8 Merge pull request #1251 from justincormack/docs
Cleanup after merge
2017-03-07 12:53:20 +00:00
Justin Cormack
5ab5b32413 Cleanup after merge
- update README
- script to start qemu
- fixes to hyperkit

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 12:23:53 +00:00
Justin Cormack
579b6c5f10 Merge pull request #1250 from rneugeba/phony
build: Make some top-level targets .PHONY
2017-03-07 11:33:46 +00:00
Rolf Neugebauer
9e2d7df258 build: Make some top-level targets .PHONY
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-07 10:54:10 +00:00
Justin Cormack
5996dc8418 Merge pull request #1248 from justincormack/remove-alpine
Out with the old, in with the new Moby
2017-03-07 09:37:20 +00:00
Justin Cormack
159202416c Out with the old, in with the new Moby
- 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>
2017-03-06 22:28:41 +00:00
Justin Cormack
1ced40db97 Merge pull request #1249 from tych0/first-moby-pr
fix some shellcheck issues
2017-03-06 21:56:38 +00:00
Tycho Andersen
fb22969380 fix some shellcheck issues
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>
2017-03-06 13:25:45 -08:00
Justin Cormack
ab6575c089 Merge pull request #1246 from justincormack/iso-targets
Add output types for BIOS and EFI ISOs
2017-03-03 21:40:17 -08:00
Justin Cormack
e35c4c9b37 Add output types for BIOS and EFI ISOs
Note that the EFI ISO is not yet automatically sized, and the
kernel command lines are currently hard coded in the builders.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-03 18:44:47 -08:00
Justin Cormack
3b838896b0 Merge pull request #1243 from justincormack/output
Add initial support for specifying the output type
2017-03-03 15:51:10 -08:00
Justin Cormack
4cfd00832f Add initial support for specifying the output type
Currently only supports kernel+initrd output but will add the rest
soon.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-03 14:49:47 -08:00
Rolf Neugebauer
4e18f4daaf Merge pull request #1240 from dsheets/database-mac-cleanup-dir
database-mac: clean up /mnt/db after use
2017-03-03 08:50:18 -08:00
David Sheets
b75c4070d1 database-mac: clean up /mnt/db after use
Leaving this unnecessary directory in place caused docker/for-mac#1379.

Signed-off-by: David Sheets <dsheets@docker.com>
2017-03-03 13:08:15 +00:00
Justin Cormack
8bb23d79ac Merge pull request #1209 from FrenchBen/clean-cloud
Removed extra cloud make
2017-03-02 17:12:31 -08:00
French Ben
8000e7d5ca Removed moby dependency for aws/gcp/azure
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 14:51:14 -08:00
French Ben
9b23adbcea Rebased cloud clean
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 13:50:18 -08:00
French Ben
18222c638d Removed extra init packages
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 13:50:01 -08:00
French Ben
e3d1349d3d Removed extra cloud make
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 13:50:01 -08:00
French Ben
0276d52340 Removed extra cloud make
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 13:49:08 -08:00
Justin Cormack
355cbcab7c Merge pull request #1239 from justincormack/tool-add-files
Add some support to add files in Yaml config
2017-03-02 12:07:20 -08:00
Justin Cormack
ec643ee8d3 Add some support to add files in Yaml config
You can specify a file with contents.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-01 22:07:45 -08:00
Riyaz Faizullabhoy
c133b04475 Merge pull request #1237 from justincormack/no-experimental-default
Default to non experimental mode
2017-03-01 21:55:38 -08:00
Justin Cormack
41ec05c101 Merge pull request #1238 from rneugeba/improv
Infrakit plugin improvements
2017-03-01 18:02:25 -08:00
Justin Cormack
e022009cdc Merge pull request #1236 from justincormack/shutdown
Better shutdown script
2017-03-01 17:54:35 -08:00
Rolf Neugebauer
1c3f4b4865 infrakit: Make Destroy() usable elsewhere
Don't return if the process does not exist. Instead proceed and delete
the state directory.

This allows us to use the Destroy() method elsewhere to clean up the state.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-01 17:41:18 -08:00
Justin Cormack
7177a9f9b7 Default to non experimental mode
Editions should set experimental in `daemon.json` if they want to
have it set.

See #1076 and https://github.com/docker/pinata/issues/6424

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-01 17:35:14 -08:00
Rolf Neugebauer
d1ad02e079 infrakit: Move default VM directory to .infrakit/hyperkit-vms
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-01 17:13:17 -08:00
Justin Cormack
367c217283 Better shutdown script
- make sure we unmount filesystems

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-01 17:01:38 -08:00
Rolf Neugebauer
95fa38f879 infrakit: removed vm-lib from arguments
Instead pass the directory where to find initrd/vmlinuz via the
"Moby" entry in the instance JSON config.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-01 16:52:37 -08:00
Rolf Neugebauer
ab15f8c914 Merge pull request #1235 from rneugeba/fix
scripts: Fix enabling of VPNKit L2 bridge mode
2017-03-01 16:43:07 -08:00
Rolf Neugebauer
30dae6b278 scripts: Fix enabling of VPNKit L2 bridge mode
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-01 16:28:31 -08:00
Rolf Neugebauer
af2ee9e023 infrakit: Use template based instance configuratio
This change now allows setting the Disk size, memory, and number of CPUs
for an instance via the JSON config file.

We now also write the hyperkit command line to the VM directory.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-01 16:09:30 -08:00
Justin Cormack
ce417eab07 Merge pull request #1234 from justincormack/cleanup-tool
Refactoring of Moby tool
2017-03-01 16:07:51 -08:00
Justin Cormack
6abcdd0000 Refactoring of Moby tool
- split out config processing a bit
- just use `capabilities` not `cap-add` and `cap-drop`
- allow use of CAP_ prefix on capabilities, as this is what `runc` uses
- add nginx to example config
- fix bind mounts

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-01 15:52:51 -08:00
Justin Cormack
82ee399d0b Merge pull request #1232 from riyazdf/fix-vpnkit-makefile
Fix old slirp references to vpnkit
2017-03-01 14:16:18 -08:00
Riyaz Faizullabhoy
4502f3b8a8 Fix old slirp references to vpnkit
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-01 13:54:08 -08:00
Justin Cormack
480b5b70b1 Merge pull request #1218 from rneugeba/infrakit
tools: Add initial HyperKit/Moby InfraKit instance plugin
2017-02-28 19:03:02 -08:00
Rolf Neugebauer
175daffe71 tools: Add initial HyperKit/Moby InfraKit instance plugin
This is the first cut of a InfraKit instance plugin which
primarily allows one to manage Moby instances (though, other Linux's
may work too).

It's very rough on the edges and needs work and update to handle
templates and better configuration etc.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-02-28 18:51:31 -08:00