Commit Graph

7098 Commits

Author SHA1 Message Date
Justin Cormack
805be09669 Merge pull request #1736 from deitch/fix-swap-example
use updated kernel and correct path in examples/swap.yml
2017-04-29 20:56:54 +01:00
Avi Deitcher
f72a2e7bef use updated kernel and correct path in examples/swap.yml
for swap.sh, take any command-line options, not just those with an arg
that in turn requires a new hash on the example

Use latest 4.9.x kernel to keep in line with other examples

Replace (bash) herestring with (posix) heredoc in swap.sh, and update hash to match

Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-04-29 22:18:42 +03:00
Rolf Neugebauer
4ff7be375e kernels: Tweak the ubuntu script a little
No actual source change, just make it easier to enable
kernel headers should they be needed.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-29 13:11:52 +01:00
Rolf Neugebauer
31d84a6380 kernels: Add System.map to kernel hub image
Also, don't fail if the headers are not installed

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-29 13:11:52 +01:00
Rolf Neugebauer
47ed84ee68 kernels: Don't pull to check if image exists on hub
Doing a "docker pull" to check if an image exist on hub
takes a long time for the number of images, in particular
in the linuxkit/kernel-mainline repo.

Instead, get a list of tags on Hub and check that way. This
does not check if the image was signed, but should be good
enough.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-29 11:24:01 +01:00
Justin Cormack
facdf93bac Merge pull request #1741 from justincormack/swap-hash
Update tag for swap package, having pushed to hub
2017-04-28 19:34:53 +01:00
Justin Cormack
462a5dfd5e Update tag for swap package, having pushed to hub
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-28 19:05:06 +01:00
Riyaz Faizullabhoy
95a9a4ff67 Use IsErrNotFound to tighten err handling
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-28 10:50:58 -07:00
Riyaz Faizullabhoy
ec6fea1d67 Use Docker API for run
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-28 10:45:37 -07:00
Rolf Neugebauer
6708264c7a Merge pull request #1740 from rneugeba/kern-fix
kernels: Fix annoying error in shell scripts
2017-04-28 18:28:33 +01:00
Rolf Neugebauer
835a3d2e4d kernels: Fix annoying error in shell scripts
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-28 17:51:36 +01:00
Rolf Neugebauer
f54d884183 Merge pull request #1738 from rneugeba/kernels
Add support for building mainline, Ubuntu and Debian kernel packages
2017-04-28 17:32:21 +01:00
Rolf Neugebauer
4f5c5aca7a kernels: Add support for creating Debian kernel packages
This only pulls in 4.x kernels and does not include the
headers to build modules against.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-28 17:07:28 +01:00
Rolf Neugebauer
5b28cfafb2 kernels: Add support for creating ubuntu kernel packages
This only covers the 4.x Ubuntu kernels and for now does
not include the headers to build modules against.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-28 17:07:24 +01:00
Rolf Neugebauer
82c7118de9 kernels: Create LinuKit kernel images from Ubuntu mainline
The Ubuntu mainline PPA has kernel.org based kernels for many
kernel releaseis.  This commit adds suport for downloading and
converting the 3.16.x long long term support kernel as well
as the current 4.x series.  The "mainline.sh" script only
downloads/processes kernels which have not yet been put on
Hub.

The kernels are stored under "linuxkit/kernel-mainline" and are
tagged with the kernel version.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-28 17:07:24 +01:00
Justin Cormack
ab1ae3f271 Merge pull request #1733 from justincormack/bzimage-to-kernel
Change to use kernel not bzImage everywhere
2017-04-28 16:47:48 +01:00
Justin Cormack
6155e8c8bc Change to use kernel not bzImage everywhere
Previously we hardcoded `bzImage` which is not used for all
use cases or architectures.

fix #1630

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-28 16:24:15 +01:00
Justin Cormack
d504afe479 Merge pull request #10 from justincormack/pull-before-create
Make sure we always pull images if create fails
2017-04-28 16:23:36 +01:00
Justin Cormack
d0f867e9b2 Make sure we always pull images if create fails
`docker create` will not pull an image so we need an additional fallback.

Rework the pull and trust code so it is in one place to facilitate this.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-28 16:14:15 +01:00
Justin Cormack
95613b9d93 Merge pull request #1734 from justincormack/build-pull
Pull images on CI
2017-04-28 15:36:59 +01:00
Justin Cormack
10ad066031 Pin moby tool commit
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-28 15:13:14 +01:00
Justin Cormack
791e11f07a Pull images on CI
Always do `moby build --pull` on CI.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-28 14:41:23 +01:00
Justin Cormack
dbd2593328 Merge pull request #8 from justincormack/no-bzimage
Switch from bzImage to kernel for kernel image
2017-04-28 13:56:59 +01:00
Justin Cormack
ef017ac223 Support both kernel and bzImage for now
Also do not require `tar` to be in container, use the standard
image export code that we already have and find the files we
want.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-28 12:48:04 +01:00
Justin Cormack
2cd9bead88 Switch from bzImage to kernel for kernel image
This was too architecture specific previously.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-28 12:38:04 +01:00
Justin Cormack
3375f32d51 Merge pull request #9 from riyazdf/docker-api-usage
Use Docker API for part of tool
2017-04-28 11:48:52 +01:00
Riyaz Faizullabhoy
37f57cfa84 Use Docker API for rm, create, export, and inspect
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-27 14:09:17 -07:00
Riyaz Faizullabhoy
fcdfe5c356 vendor new client and api
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-27 13:31:16 -07:00
Justin Cormack
a02e515740 Merge pull request #1727 from rneugeba/win
scripts: Add simple Powershell script to manage  Hyper-V VMs
2017-04-27 18:54:36 +01:00
Justin Cormack
937a858249 Merge pull request #1729 from estesp/qemu-disk-flag-fix
The `-drive` parameter for qemu run requires more flags
2017-04-27 18:54:14 +01:00
Justin Cormack
98dfe7ad55 Merge pull request #1721 from riyazdf/more-signing-targets
Signing targets for binfmt, rngd, compilers, toybox, tini
2017-04-27 18:53:49 +01:00
Riyaz Faizullabhoy
2c4c55859f Add separate sign-tag target, keep tool building offline
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-27 10:34:40 -07:00
Phil Estes
5612718b0f
The -drive parameter for qemu run requires more flags
To use `-drive` as an analog for `-hda` or `-hdb`, etc. the qemu
docs note that "media" and "index" are required flags. Local
testing shows that drive shows up properly as `/dev/sda` after
this change.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-04-27 13:33:03 -04:00
Justin Cormack
ed22a11789 Merge pull request #1728 from justincormack/ndodev
Fix typo "ndodev"
2017-04-27 18:23:32 +01:00
Justin Cormack
dae0e4efae Fix typo "ndodev"
Not sure when this arrived but it was stopping anything running.
Appears not to be in the older test `init` containers.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-27 18:01:05 +01:00
Rolf Neugebauer
b432b9c8ca scripts: Add simple Powershell script to manage Hyper-V VMs
This script can create/start/stop/remove Hyper-V VMs. The
VMs are configured as Gen2 VMs which boot from EFI ISOs.

Network and Disk configuration is optional.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-27 14:41:07 +01:00
Justin Cormack
4694f5a7ec Merge pull request #7 from justincormack/makefile
Add a simple Makefile
2017-04-27 14:29:26 +01:00
Justin Cormack
719025a708 Add a simple Makefile
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-27 14:25:07 +01:00
Justin Cormack
7517c830d7 Merge pull request #6 from AkihiroSuda/stdin
build: support reading yaml from stdin
2017-04-27 14:12:34 +01:00
Rolf Neugebauer
3a668d8caf Merge pull request #1726 from rneugeba/kern-up3
kernel: Update to 4.4.64/4.9.25/4.10.13
2017-04-27 11:14:48 +01:00
Rolf Neugebauer
14b92b363a kernel: Update to 4.4.64/4.9.25/4.10.13
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-27 08:54:17 +01:00
Rolf Neugebauer
3308d99331 Merge pull request #1725 from rneugeba/kern-up
kernel: Update to 4.4.63/4.9.24/4.10.12
2017-04-27 08:38:47 +01:00
Rolf Neugebauer
9b49be4bcf Merge pull request #1724 from rneugeba/mac-doc
docs: Clarify hyperkit networking
2017-04-27 01:48:52 +01:00
Rolf Neugebauer
6b61e50876 docs: Clarify hyperkit networking
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-27 01:40:35 +01:00
Rolf Neugebauer
6dcb0c1c97 kernel: Update to 4.4.63/4.9.24/4.10.12
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-27 00:43:02 +01:00
Rolf Neugebauer
f0d3371c5c Merge pull request #1723 from rneugeba/kern-up
kernel: Update to 4.4.62/4.9.23/4.10.11
2017-04-27 00:35:55 +01:00
Rolf Neugebauer
c2dbeaa932 kernel: Update to 4.4.62/4.9.23/4.10.11
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-26 23:38:59 +01:00
Riyaz Faizullabhoy
8783797384 Merge pull request #1722 from fntlnz/fix/makefile-test-targets
Specified platform for hyperkit and qemu
2017-04-26 15:33:48 -07:00
Rolf Neugebauer
d1cebb3b55 Merge pull request #1720 from rneugeba/kbuild
Major rewrite of the kernel build
2017-04-26 23:29:07 +01:00
Lorenzo Fontana
910205036a
Specified platform for hyperkit and qemu
Signed-off-by: Lorenzo Fontana <lo@linux.com>
2017-04-27 00:18:02 +02:00