Commit Graph

2265 Commits

Author SHA1 Message Date
Justin Cormack
41fac88bf6 Add VHD and GCE output formats
- VHD is uncompressed VHD. Currently hard coded at 1GB, which may need to change. Use `format: vhd`
- GCE is the GCE compressed tarred raw image. Use `format: gce-img` - reserving `gce` for actually
  uploading the image.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 16:10:48 +00:00
Justin Cormack
6122a483dc Merge pull request #1264 from tych0/hoist-kernel-cmdline
Hoist kernel cmdline
2017-03-09 22:34:30 +00:00
Tycho Andersen
a6c5dbf8f5 better debugging output in more error cases
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-09 14:29:40 -08:00
Tycho Andersen
e8319f6761 hoist kernel cmdline into moby.yaml
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-09 14:29:40 -08:00
Justin Cormack
9d3eaefd93 Merge pull request #1271 from rneugeba/infra-up
infrakit: Fix detection of running proceses
2017-03-09 22:13:26 +00:00
Rolf Neugebauer
d6d2162999 infrakit: Fix detection of running proceses
os.FindProcess() does not return an error when then process does not
exist. It even returns a dummy process object.

Use the go-ps package to find out if the hyperkit process is actually
running.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-09 22:08:44 +00:00
Justin Cormack
3d93c723f5 Merge pull request #1270 from justincormack/go-strip
Strip Go files to make them a bit smaller
2017-03-09 19:21:10 +00:00
Tycho Andersen
81a439751b hoist kernel command line out of qemu docker image
we want to fiddle with this for selinux, and probably for other things too.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-09 11:13:49 -08:00
Justin Cormack
4170897db0 Strip Go files to make them a bit smaller
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 15:30:15 +00:00
Justin Cormack
bd2cd62017 Merge pull request #1269 from justincormack/sysctl
Add in sysctl container
2017-03-09 14:55:49 +00:00
Justin Cormack
681ed3f37d Add in sysctl container
- based on @riyazdf earlier unmerged Go version 891c006d34/alpine/containers/cloud-config/main.go

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 14:41:19 +00:00
Justin Cormack
f2419e9e18 Merge pull request #1268 from justincormack/no-wait-ctr
Do not wait for containerd to be ready, as not using it yet
2017-03-09 14:41:05 +00:00
Justin Cormack
eefa303497 Do not wait for containerd to be ready, as not using it yet
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 14:37:28 +00:00
Justin Cormack
8da4d381fb Merge pull request #1267 from justincormack/no-licensing
Remove licensing directory
2017-03-09 12:21:34 +00:00
Justin Cormack
7ee38c61fb Remove licensing directory
We are not going to do any closed source releases of this code so
we can remove the licensing used for editions GPL compliance.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 12:08:03 +00:00
Justin Cormack
879b6a97cb Merge pull request #1259 from rneugeba/kern-doc
docs: Update kernel patches documentation
2017-03-08 00:11:10 +00:00
Justin Cormack
c86bc7276a Merge pull request #1260 from justincormack/docker-container2
Add Docker container
2017-03-08 00:07:56 +00:00
Justin Cormack
ae9bda484d Merge pull request #1261 from justincormack/kernel-push
Add back code to push kernel to hub
2017-03-08 00:04:29 +00:00
Justin Cormack
d26769b219 Add back code to push kernel to hub
- Accidentally removed from top level Makefile, now in kernel Makefile.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 23:48:46 +00:00
Justin Cormack
933c826d74 Add Docker container
- need to format filesystem before testing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 21:37:07 +00:00
Rolf Neugebauer
71b05400a4 docs: Update kernel patches documentation
Make the process and the requirements for patches clearer.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-07 19:42:23 +00:00
Justin Cormack
3a6fdc5d76 Merge pull request #1258 from tych0/better-debugging
better debugging output in some error cases
2017-03-07 19:07:05 +00:00
Tycho Andersen
6990a6257a 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
c08e440bb9 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
848afc03e4 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
d76e0c1dd3 Merge pull request #1255 from rneugeba/infra-docs
infrakit: Update docs
2017-03-07 15:58:56 +00:00
Justin Cormack
5a2223e049 Merge pull request #1254 from rneugeba/patch-up
kernel: Update 4.9.x patches
2017-03-07 15:34:32 +00:00
Rolf Neugebauer
d78c402c11 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
2982c59c53 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
764cd60622 Merge pull request #1253 from justincormack/docs
Add some more info about config file
2017-03-07 14:01:28 +00:00
Justin Cormack
702bd7c46e 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
0df20dd313 Merge pull request #1252 from justincormack/cleanup
More cleanup
2017-03-07 13:09:03 +00:00
Justin Cormack
fc6c5e5c66 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
33be15d4f6 Merge pull request #1251 from justincormack/docs
Cleanup after merge
2017-03-07 12:53:20 +00:00
Justin Cormack
c003897b75 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
79da4eeffa Merge pull request #1250 from rneugeba/phony
build: Make some top-level targets .PHONY
2017-03-07 11:33:46 +00:00
Rolf Neugebauer
de3d1f7d13 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
785e1cea4e 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
cd08084738 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
0e6c1a97ba Merge pull request #1249 from tych0/first-moby-pr
fix some shellcheck issues
2017-03-06 21:56:38 +00:00
Tycho Andersen
90640d6308 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
413b075248 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
2ab099f349 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
d57e00749f 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
3f844b4fdd 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
867d870a62 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
46e4076736 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
1f9400ff1d Merge pull request #1209 from FrenchBen/clean-cloud
Removed extra cloud make
2017-03-02 17:12:31 -08:00
French Ben
5e73feb7f5 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
b62fd55ec1 Rebased cloud clean
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 13:50:18 -08:00