Commit Graph

121 Commits

Author SHA1 Message Date
Rolf Neugebauer
a06e6bbb37 build: Switch using go-compile from linuxkit hub org
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-12 21:28:17 +01:00
Dave Tucker
00edddac9a Add vndr to go-compile and add vendoring docs
This makes it easier to safely udpate the vendor directory

Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-11 13:35:51 +01:00
Robb Kistler
99e1643c82 Change hyperkit-test to test-hyperkit
Other test targets are all `test-*`, should be consistent

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-04-07 19:04:36 -07:00
Dave Tucker
a4980c8bfb makefile: Add targets to test GCP
Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-07 15:22:12 +01:00
Dave Tucker
fddfd0b3ec makefile: Allow a bin/moby to be provided
This is needed for CI to be able to run `moby run $platform` with a
known good version of moby. For example, the one generated when building
the `master`.

This protects CI from any nefarious changes to the `moby` tool and
allows `moby run` to be used safely to test PRs.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-07 15:20:35 +01:00
Justin Cormack
6dc0ee4748 Remove Makefile targets that build moby.yml
Its trivial to just do `bin/moby build moby` etc.

Just leaving test targets, which should really move
out of root later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-07 14:54:41 +01:00
Justin Cormack
3223897232 Merge pull request #1514 from rneugeba/cli-up
Improvements to the CLI
2017-04-06 13:01:58 +01:00
Rolf Neugebauer
3e53aab4ce cli: Add a 'version' version
Pass version and git commit hash from the Makefile
into main.go. Add a 'version' subcommand to print
the information.

While at it also tweak the help output to only print the
command name and not the entire path.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-06 12:29:52 +01:00
Thomas Gazagnaire
8f64191dee Fix make qemu
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-04-06 13:20:33 +02:00
Rolf Neugebauer
fa7c85e235 build: Improve dependency for CLI/infrakit build
Use vendor.conf as a proxy for ./vendor contents

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-05 23:10:08 +01:00
Rolf Neugebauer
df993d8b0d build: Fix copy&paste error for Infrakit dependencies
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-05 19:52:31 +01:00
Justin Cormack
bc0feab1c9 Merge pull request #1476 from riyazdf/make-cleaner
Make clean cleaner, and ignore more output disks
2017-04-04 17:23:12 +01:00
Riyaz Faizullabhoy
bba42d2d7e Make clean cleaner, and ignore more output disks
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-04 08:19:20 -07:00
Dave Tucker
6726746484 Add a runner for UEFI ISOs
Fixes #480

Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-03 14:13:37 +01:00
Rolf Neugebauer
e9fbe43b34 Rename .yaml to .yml
docker-compose and other utilities use the .yml extension.
For consistency rename all .yaml to .yml

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-27 09:53:26 +02:00
Rolf Neugebauer
6a29d153f5 infrakit: Move the hyperkit instance plugin into the source directory
- The tools directory ideally should not contain source code
- Removes double vendoring of packagages
- Makes it easer to hook the build into the top-level Makefile

Eventually, the plugin should be moved to the infrakit repo.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-25 13:02:45 +01:00
Justin Cormack
668408614f Use moby run to run hyperkit in Makefile
- cut down the hyperkit script but leave as reference for now
- an error left over after shutdown that needs removing at some point

fix #1375

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-24 18:52:42 +00:00
Justin Cormack
c76074ff66 Remove docker2tar docker image, use Docker directly from Go
Removing the left over indirect creates that use the Docker socket
and run in containers not directly.

See #1347

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-22 22:26:13 +00:00
Rolf Neugebauer
759637b3f0 moby: Introduce the "build" subcommand
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-22 14:38:02 +00:00
Justin Cormack
e643f4a454 Move Go code to src/cmd
This does not get everything where we want it finally, see #1266
nor the optimal way of building, but it gets it out of top level.

Added instructions to build if you have a Go installation.

Not moving `vendor` yet.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-21 14:37:23 +00:00
Justin Cormack
66124e4c34 Teach make clean about more cleanliness
We were not deleting many of the kinds of build artifact.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-21 13:42:51 +00:00
Justin Cormack
5746d3d2bf Move test related code to the test directory
This does not yet move the `make test` options in the Makefile, will
probably move those too later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-20 16:14:06 +00:00
Justin Cormack
9208496d82 Output kernel command line to a file in the kernel+initrd output case
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>
2017-03-20 13:43:09 +00:00
Rolf Neugebauer
0dc52bb387 kernel: Remove remaining AUFS bits
Commit c3fc6faa35 removed AUFS support bit missed the kernel
config and a mentioned in the main Makefile.

This commit removes these also.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-19 08:53:40 +00:00
Justin Cormack
8427af09c5 Make the hyperkit script get the kernel command line if just passed a name
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>
2017-03-15 15:01:47 +00:00
Justin Cormack
c7d1438128 Merge pull request #1264 from tych0/hoist-kernel-cmdline
Hoist kernel cmdline
2017-03-09 22:34:30 +00:00
Tycho Andersen
a383e6bb46 hoist kernel cmdline into moby.yaml
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-09 14:29:40 -08:00
Justin Cormack
154c3516b2 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
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
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
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
French Ben
9b23adbcea Rebased cloud clean
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 13:50:18 -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
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
4ffd42e4f0 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
2fa112b1b7 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
945f826c8b 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
7fdb89d22f 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
f4a112dc21 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
0b2251212a 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
53399b98be 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
65e2c49ca2 Merge pull request #1156 from justincormack/top-level-dockerfiles
Simpler media Dockerfiles
2017-02-06 16:23:23 +00:00
Justin Cormack
38ef228b7b Simpler media Dockerfiles
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-06 15:50:40 +00:00
Justin Cormack
4aa0444c92 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
3f81edee37 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
aff2b5f514 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
57ee2eae95 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
7b7e672270 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
2db23f8d18 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
3e020abdb2 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