Commit Graph

3803 Commits

Author SHA1 Message Date
Mindy Preston
bcb0c52fff nudge some build updates around
build from (now-released) canpnproto 0.6.0; use the latest jbuilder beta.

Signed-off-by: Mindy Preston <mindy.preston@docker.com>
2017-06-09 13:38:55 -05:00
Riyaz Faizullabhoy
9d8eba91eb Merge pull request #2012 from justincormack/homebrew-docs
Add homebrew instructions
2017-06-09 09:20:48 -07:00
Justin Cormack
a74e8657db Add homebrew instructions
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-09 16:36:31 +01:00
Justin Cormack
dcd6cb09a9 Merge pull request #2011 from justincormack/make-no-docker
Add a "local" make target that does not use Docker
2017-06-09 16:07:32 +01:00
Justin Cormack
ac90b50437 Add a "local" make target that does not use Docker
This assumes you are in the right directory, have Go set up etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-09 15:24:21 +01:00
Rolf Neugebauer
0b2506523d Merge pull request #2010 from rn/maintain
Update MAINTAINERS
2017-06-09 13:48:36 +01:00
Rolf Neugebauer
2674c999b1 Merge pull request #2009 from rn/disksize
cmd: Default disk "size" parameter to GB
2017-06-09 13:43:28 +01:00
Rolf Neugebauer
91b9dde12e Update MAINTAINERS
Both @ijc25 and @rneugeba changed their GH username

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-09 13:00:50 +01:00
Rolf Neugebauer
bdf9b1f31a cmd: Default disk "size" parameter to GB
Most cloud providers allow disk size allocation on in units
of GB. Make it the default for linuxkit disk "size" arguments.
Users can override the unit by appending a M to the disk size.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-09 11:51:48 +01:00
Riyaz Faizullabhoy
84090f6b4b Merge pull request #2007 from riyazdf/tool-disk-syntax-change
Tool disk syntax change
2017-06-08 20:53:12 -07:00
Riyaz Faizullabhoy
8726adaa78 s/moby/linuxkit for run
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-08 17:10:14 -07:00
Riyaz Faizullabhoy
9c8e82734d fix disk size arg
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-08 17:09:52 -07:00
Riyaz Faizullabhoy
464d77c5ae Merge pull request #2004 from deitch/update-init-getty-examples
Update linuxkit/init to gettyless; add getty to relevant examples
2017-06-08 11:28:43 -07:00
Avi Deitcher
ee2766de78 Update linuxkit/init to gettyless; add getty to relevant examples
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-06-08 19:56:34 +03:00
Justin Cormack
854a53130f Merge pull request #2005 from deitch/fix-init-issue
Fix perms on /etc/init.d/000-issue
2017-06-08 17:39:32 +01:00
Riyaz Faizullabhoy
9155dff870 Merge pull request #2002 from justincormack/docs-to-tool
Move yaml docs to moby/tool
2017-06-08 09:21:36 -07:00
Avi Deitcher
f2cece3c61 Fix perms on /etc/init.d/000-issue
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-06-08 18:49:29 +03:00
Justin Cormack
050fa905f1 Move yaml docs to moby/tool
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-08 15:54:40 +01:00
Justin Cormack
e0dc6302a8 Merge pull request #1978 from deitch/gettyless-init
Remove all getty from init
2017-06-08 15:33:21 +01:00
Justin Cormack
1f56da3288 Merge pull request #2001 from thaJeztah/update-mailmap
Update .mailmap to make auto-generating work
2017-06-08 14:55:29 +01:00
Rolf Neugebauer
6d1b511f86 Merge pull request #2000 from rneugeba/build
build: Make sure the tools compile on Linux/macOS/Windows
2017-06-08 14:46:15 +01:00
Rolf Neugebauer
3e5797a911 build: Make sure the tools compile on Linux/macOS/Windows
This patch adds cross compilation steps for Linux, macOS and,
Windows to the CI targets to ensure that the all commands cross
compile nicely.

Although the CI runs on Linux we still explicitly compile for
Linux in case developers use the CI targets locally on a
non-Linux host.

While at it, also fix the GOARCH override to enable cross compilation
of ARM64 on Linux. The build support seems to work, but the
compilation fails (hence it is not added to the test).

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-08 13:57:42 +01:00
Sebastiaan van Stijn
b9af64e506
Update .mailmap to make auto-generating work
When mapping e-mail addresses and names;

    <preferred@example.com> <foo@bar.com>

Maps `foo@bar.com` to `preferred@example.com`, whereas:

     Preferred Name <preferred@example.com> <foo@bar.com>

Will update the e-mail address _and_ set the preferred name, _if_ the original
e-mail address in the commit was `<foo@bar.com>` (otherwise the rule is not
executed).

Finally, this rule:

 Preferred Name <preferred@example.com>

Will set the name to `Preferred Name` if the e-mail address in the commit
matches `preferred@example.com`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-08 14:56:10 +02:00
Justin Cormack
8a18954b75 Merge pull request #1999 from justincormack/authorsup
Update AUTHORS
2017-06-08 13:26:08 +01:00
Justin Cormack
2ab1022d6b Update AUTHORS
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-08 12:37:16 +01:00
Justin Cormack
68cf80d4aa Merge pull request #1998 from justincormack/enable-c-t-all-tests
Re-enable content trust on build test
2017-06-08 12:14:13 +01:00
Justin Cormack
907ebfe8d8 Merge pull request #1997 from justincormack/getty-cleanup
Getty cleanup
2017-06-08 11:46:22 +01:00
Justin Cormack
6066fb761f Merge pull request #1996 from rneugeba/example
example: Remove docker.json from linuxkit.yml
2017-06-08 11:42:00 +01:00
Justin Cormack
985ddbd4d8 Re-enable content trust on build test
I disabled this for speed when content trust cache was not working

See also #1995

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-08 11:19:20 +01:00
Justin Cormack
9d4aed42f1 Update examples/getty with new hash since Makefile changed
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-08 11:05:22 +01:00
Justin Cormack
513f661458 Clean up getty Makefile to match others
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-08 11:02:48 +01:00
Rolf Neugebauer
3c0ebbb662 example: Remove docker.json from linuxkit.yml
The 'docker.json' file is not used in the top level
example and was merely there as an example use of the
'file' section. Since we now have the containerd config
file in the 'file' section the 'docker.json' entry is
no longer needed.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-08 10:59:23 +01:00
Riyaz Faizullabhoy
b5ae1260ab Merge pull request #1982 from rneugeba/hyperkit
Convert some tests to run on hyperkit when run on OSX
2017-06-07 17:54:35 -07:00
Riyaz Faizullabhoy
33d66d380e Merge pull request #1994 from tych0/fix-pkg-builds
fix package builds in some cases
2017-06-07 17:49:32 -07:00
Justin Cormack
7700b75802 Merge pull request #1993 from riyazdf/getty-tag
pkg/getty: fix example image tag
2017-06-08 00:00:45 +01:00
Justin Cormack
9b82914f7d Run make tag on pkg directory to check packages build
This at least checks for buildability of packages, even if we
are not yet pushing them.

See https://github.com/linuxkit/linuxkit/issues/1991 for what it mitigates.
Will not pass until this is fixed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-07 16:37:36 -06:00
Tycho Andersen
cf9397786c fix up second rngd containerd->alpine typo
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-07 16:36:38 -06:00
Rolf Neugebauer
4195ff8553 tests: Run the package tests on HyperKit when running on OSX
With the updated HyperKit go bindings we can redirect the VM output
and check for test results. Use this for all kernel tests as this
speeds up running the tests on OSX.

Also use 'set -x' instead of 'set -v' for consistency and don't fail
when the clean up code fails.

The mkimage package test currently doesn't work on HyperKit as it
requires support for multiple disks to be added.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-07 23:31:18 +01:00
Rolf Neugebauer
d449ef6901 tests: Run kernel tests on HyperKit when running on OSX
With the updated HyperKit go bindings we can redirect the VM output
and check for test results. Use this for all kernel tests as this
speeds up running the tests on OSX.

Also enable 'set -x' so we see the commands being executed and don't
fail the test if the cleanup failed.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-07 23:31:18 +01:00
Rolf Neugebauer
8e647fe974 vendor: Update hyperkit go bindings
The update allows redirecting the VMs output.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-07 23:30:30 +01:00
Rolf Neugebauer
1f3fb932fa Merge pull request #1990 from rneugeba/kup
kernel: Update to 4.11.4/4.9.31./4.4.71
2017-06-07 23:28:17 +01:00
Tycho Andersen
a208413ac0 fix package builds in some cases
0eb21735ae accidentally broke some package
builds by switching linuxkit/alpine to linuxkit/containerd. Let's revert
the ones that shouldn't be there.

Closes #1991

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-07 16:19:40 -06:00
Riyaz Faizullabhoy
fea68de22c pkg/getty: fix example image tag
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-07 15:18:11 -07:00
Justin Cormack
09e6ff2e34 Merge pull request #1977 from deitch/console-login
Add getty pkg
2017-06-07 23:15:47 +01:00
Rolf Neugebauer
477435f42b kernel: Update to 4.11.4/4.9.31./4.4.71
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-07 22:27:16 +01:00
Avi Deitcher
5db7e6fe69 Add getty pkg
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-06-08 00:11:53 +03:00
Riyaz Faizullabhoy
c49a5bea5b Merge pull request #1987 from riyazdf/sig-2017-06-21-agenda
sig: initial draft schedule for next security sig meeting
2017-06-07 13:32:42 -07:00
Justin Cormack
c8067287ff Merge pull request #1986 from riyazdf/sig-video
sig: youtube link for 2017-06-07
2017-06-07 20:57:31 +01:00
Justin Cormack
fc52966150 Merge pull request #1983 from justincormack/mobyup
Update Moby tool
2017-06-07 20:56:26 +01:00
Justin Cormack
c8a3fd0e7a Update Moby tool
- rename img→raw and gcp-img→gcp
- support creating `docker` outputs, see https://github.com/moby/tool/tree/master/examples
- less memory usage via streaming outputs
- allow specification of multiple yaml files in a single command line, improves modularity
- notary fixes and local cache, so does not pull as much
- you now have to specify the full filename of the yaml file, you cannot omit the suffix

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-07 20:11:37 +01:00