Commit Graph

88 Commits

Author SHA1 Message Date
Riyaz Faizullabhoy
4fa5273fe9 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
169f3e670b slirp binary renamed to vpnkit
Recently com.docker.slirp was renamed.

Please update Docker for Mac before using this script...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-28 17:52:38 -08:00
Robb Kistler
cfcb540eb8 Delegated make targets should be phony targets
Make won't evaluate actual dependencies of targets called with
`$(MAKE) -C` if the target file already exists.  Marking the
top-level targets `.PHONY` will enable incremental builds.

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-02-28 10:18:50 -08:00
Riyaz Faizullabhoy
6e7c0edb55 Fix alpine/mobylinux-efi.iso target
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-27 16:18:37 -08:00
Justin Cormack
e3d14a4f4b Add a CI tag Makefile target
The CI will set `CI_TAG` to the tag name, which will be used for the
uploaded images instead of the git commit ID.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-21 10:36:25 +00:00
Justin Cormack
7fa748810d Change kernel upload for new tooling
The mobylinux/kernel image now has the bzImage (no longer named vmlinuz64)
and a tarball of the files needed for the initrd, ie modules etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-20 15:54:02 +00:00
Justin Cormack
70a5f68cb2 Generate media Dockerfile
It is trivial no need to have committed in repo.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 14:01:32 +00:00
Justin Cormack
3b26b76875 Move containers directory to alpine directory
Not using this with new tool, so leave for editions.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 11:10:13 +00:00
Justin Cormack
501b00de29 Merge pull request #1156 from justincormack/top-level-dockerfiles
Simpler media Dockerfiles
2017-02-06 16:23:23 +00:00
Justin Cormack
3f71568285 Simpler media Dockerfiles
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-06 15:50:40 +00:00
Justin Cormack
0eeb188e26 Move hyperkit script to scripts directory
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-06 15:28:32 +00:00
Justin Cormack
2fdf0918b3 Move kernel directory to top level
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-04 09:17:16 +01:00
Justin Cormack
8cc6ca7e40 Use hyperkit and slirp from Docker for Mac install if available
Save some downloading as the user probably has these installed
already; still fall back if not found to downloading from CI.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-02 08:48:50 +00:00
Robb Kistler
0fde2a1aa2 OS X CI test without docker installed
OS X CI endpoints won't need to do a build, the artifacts can be pulled
from mobylinux/media.  This requires docker, which may not be available.

- 'get-regextract' make target pulls media without Docker using the
  regextract utility, which it will fetch from CI if needed.
- Add initrd-test.img to mobylinux/media image

Addresses #1046

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-02-01 19:47:53 -08:00
Justin Cormack
b6f499dca5 Move test directory to top level
This is temporary, it should be under `containers/` just as soon
as we have a manifest setup.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-01 23:34:21 +00:00
Justin Cormack
364a7bb0fe Move containers directory to top level
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-01 22:56:55 +00:00
Justin Cormack
7910f7e1be Use bin dir and clean up hyperkit test
- make a `bin/` directory
- make hyperkit-test pass, as it writes to pty so redirect was not working

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-01 14:15:52 +00:00
Riyaz Faizullabhoy
2979ff0303 reformat tags before digests
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-31 09:33:06 -08:00
Justin Cormack
5bfe0a25a1 Cleanup BIOS ISO builds
- do not require specific filenames for input
- change EFI build to use `docker run`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-30 15:18:06 +00:00
Justin Cormack
ba99b1ba40 Use docker run to run tests and interactive containers
Using docker build is slower and needs lots of Dockerfiles,
while a single image with a careful script can accept any type
of image, either with `-v` to share into `/tmp` for interactive
use (where you need the input and a tty, or by adding a tarball
for cases where there is no login such as running tests, so you
can still use a remote daemon in these cases.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-24 23:41:06 +00:00
Robb Kistler
e03af4abb5 Don't fail hyperkit-test after clean
Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-01-23 11:12:42 -08:00
Justin Cormack
8328bcd3d9 Merge pull request #1039 from RobbKistler/hyperkit-test
Improve hyperkit/osx testing
2017-01-18 18:18:36 +00:00
Robb Kistler
d321479cdd Improve hyperkit/osx testing
Address #954:
- Pull hyperkit and vpnkit binaries from CI
- Use vpnkit instead of vmnet
- Add hyperkit-test test target

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-01-18 09:56:24 -08:00
Justin Cormack
36e5eb4fa1 Remove aufs4.4 reference from make media
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 16:28:43 +00:00
Justin Cormack
7c8aea8d2e make get compatibility with older builds
Old builds did not have kernel headers or kernel dev headers, so do not fail

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-12 14:35:44 +00:00
Justin Cormack
cb44fd12cd Merge pull request #987 from justincormack/reinstate-4.4
Reinstate 4.4 support
2017-01-12 11:18:14 +00:00
Justin Cormack
c73d6f1721 Add an LTS 4.4 kernel
This is the same as aufs variant, but without AUFS patches. Looks like
GCP may need this, at least initially.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-12 09:47:32 +00:00
Justin Cormack
03c9d224a4 Add prefix for make get
Allows `make AUFS=1 get` to pull the aufs build binaries.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-12 09:14:01 +00:00
Justin Cormack
3358f57891 Reinstate Linux 4.4 LTS series support
- Add back Linux kernel 4.4.x support, only for AUFS at present.
- Add back config options that are different for 4.4 series

See #923 for discussion on whether we need to do this.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-11 16:08:14 +00:00
Justin Cormack
285266dd93 Add datakit CI control file
This controls build with AUFS=1 so we can build in parallel.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-06 15:10:05 +00:00
Justin Cormack
ee7f24defd Add a development eBPF container build
See `docs/ebpf.md` for how to use. This is built by CI or you can build
manually if you customise the kernel.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-05 11:59:28 +00:00
Justin Cormack
e955457195 Add a kernel-dev tarball with kernel headers
These headers are needed for defining kernel probes etc, tested with
eBPF. Could also be used for perf, building kernel modules etc. Saved
to the media tarball at present, may add to base image or container.

Also rationalise the paths in the headers tarball a little to match.

Will add an eBPF container using these later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-04 12:10:30 +00:00
Justin Cormack
bc3823c387 make media pushing wrong image
The base image for scanning the initrd was being pushed over
the the media image for pinata.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-15 13:05:15 -08:00
Justin Cormack
7e8115ce89 Add new Makefile targets for the CI
This builds both the standard and AUFS versions of Moby,
and does `make clean` carefully.

- `make ci` for branches (pushes artifacts)
- `make pr` for PRs

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-14 16:05:54 -08:00
Justin Cormack
be8a1aaeb5 Merge pull request #880 from justincormack/kernel-4.8-4.9
Make AUFS optional and ship choice of kernels
2016-12-14 15:33:39 -08:00
Justin Cormack
5567606fd0 Make AUFS optional and ship choice of kernels
This seems the best option, although none are great

- build with `make AUFS=1` to build with AUFS support, currently with 4.8 kernel
- default is to build without AUFS support, with 4.9 kernel

This recognises that AUFS supprot is temporary #620 and only there until
we can phase it out on desktop editions, and allow the other editions that
never shipped with AUFS to ship something very close to mainline.

However we do still apply the patches so that the non AUFS branch runs fine on
all platforms, so it can be tested elsewhere.

We may be able to move the kernel versions back in line when 4.9 aufs support is out.

Plan is to shift CI to build both sets of images, and get the Desktop editions to
pick up the aufs set automatically, once this is merged.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-13 18:23:45 -08:00
Justin Cormack
f1f2f1b222 Build a GCE image
- this is a raw 1GB filesystem image with syslinux for booting
- built with libguestfs so does not need any privileges
- need not be built on GCE
- there is a target that runs the image in qemu for local tests

Does not yet have a script to upload the image to cloud storage or create image from it.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-12 19:17:24 -08:00
Justin Cormack
2f558885f0 Kernel scanning now fixed, only needs vmlinuz64
- The scanning process was not ignoring the kernel extraversion before,
so was only sometimes picking up issues.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-12 09:54:02 -08:00
Justin Cormack
f3e3a4029b Containerize test suite
- run test suite under containerd
- in future this should be converted to Go not shell see #860
- test suite is now in its own initrd, can be run on any platform not just qemu

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-09 17:13:16 -08:00
Justin Cormack
15522201ea Keep kernel headers from build
Also upload some kernel artefacts to a private repo at mobylinux/kernel on Hub for scanning.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-08 17:32:59 -08:00
Justin Cormack
2897b808bb Push a copy of the Moby base image to mobylinux/mobylinux
This will be used for ongoing security scanning.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-07 12:10:39 -08:00
Justin Cormack
a1c2442270 Remove more references to EXPERIMENTAL
can use MEDIA_PREFIX to set similar rpefix

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-24 15:02:41 +00:00
Justin Cormack
040d6faeab upgrade Docker to 1.13.0-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 16:48:26 +00:00
Justin Cormack
6fa0e3a2d4 Also pull the efi file when doing make get
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 15:41:52 +00:00
Justin Cormack
7d22f18e7a Add a script to get current binaries
If these have been pushed you can fetch them rather than doing a build. For
use in CI.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 15:22:04 +00:00
Justin Cormack
3505253d84 Merge pull request #692 from justincormack/vmlinux
Keep vmlinux in build media for kernel debugging
2016-11-07 15:55:31 +00:00
Justin Cormack
5256e9e4e7 Keep vmlinux in build media for kernel debugging
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-07 14:45:37 +00:00
Justin Cormack
255cebca11 Do not include non-efi ISO in media
We are not using this for editions.

We should be able to make a dual boot ISO, or you can create from the other
artefacts anyway.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-07 14:37:24 +00:00
Justin Cormack
f9563cff68 improve hyperkit build to do sudo in the right place
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-31 16:04:25 +00:00
Justin Cormack
bd839a3cf8 Add hyperkit build
Useful for local performance tests

Fix #443

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-31 15:34:56 +00:00