Commit Graph

3836 Commits

Author SHA1 Message Date
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
Riyaz Faizullabhoy
5a1ba2eada sig: initial draft schedule for next security sig meeting
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-07 11:56:40 -07:00
Riyaz Faizullabhoy
41ad35d9b3 sig: youtube link for 2017-06-07
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-07 11:40:19 -07:00
Riyaz Faizullabhoy
efbeea75d0 Merge pull request #1951 from dave-tucker/ports
Test that no ports are open
2017-06-07 11:30:13 -07:00
Riyaz Faizullabhoy
c628d824e1 Merge pull request #1985 from riyazdf/sig-notes
sig: notes for 2017-06-07
2017-06-07 11:24:30 -07:00
Riyaz Faizullabhoy
21e6ca46c8 Merge pull request #1984 from rneugeba/build
build: Make GOOS and GOARCH over-writeable
2017-06-07 10:59:20 -07:00
Riyaz Faizullabhoy
1339340004 sig: notes for 2017-06-07
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-07 10:46:58 -07:00
Rolf Neugebauer
20d6fcf7eb build: Make GOOS and GOARCH over-writeable
The GOOS and GOARCH are currently set based on the host 'make'
is executed on. On macOS this sets up cross compilation with
a Linux container.

Making them over-writeable allows users to test different
cross compilations, e.g., trying to build Linux binaries on macOS.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-07 18:13:57 +01:00
Dave Tucker
8763da79c9 tests: Add a test case to ensure no ports are open
Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-07 17:57:21 +01:00
Thomas Leonard
c7c33b9a56 Add example https-unikernel
This is mainly a test for the Cap'n'Proto RPC support.

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
2017-06-07 16:34:59 +01:00
Dave Tucker
1598b11375 Update YAML files to use new containerd package
Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-07 15:30:39 +01:00
Dave Tucker
1af1a20a0d containerd: Don't expose metrics by default
This can be turned on if required but we'll default to leaving it off
It's been enabled in the top-level linuxkit.yml
This port is also non-standard and there doesn't appear to be a standard
port for this as yet.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-07 15:18:13 +01:00
Rolf Neugebauer
3cc6c36837 Merge pull request #1980 from rneugeba/plat
docs: Update platform documentation
2017-06-07 16:03:50 +02:00
Avi Deitcher
a7c577468d Remove all tty init from init
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-06-07 15:43:40 +03:00
Rolf Neugebauer
0c1498d8fa docs: Update platform documentation
- Prefix platform documentation with 'platform-'
- Add/Correct links from top-level README.md
- Tweak the Azure documentation
- Move the vsudd README to platform-hyperkit.md
- Add a dummy document for qemu/kvm

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-07 13:39:41 +01:00
Justin Cormack
7efb87da50 Merge pull request #1979 from ijc25/update-containerd
Update to containerd bdf9f5f7388e8203e63a74b89800f7f3dd4a7743
2017-06-07 10:55:09 +01:00
Ian Campbell
0eb21735ae Update to containerd bdf9f5f7388e8203e63a74b89800f7f3dd4a7743
Note that this is not the latest (which was 95efd45db073 at time of writing)
but the next commit 6428b4bad0c2 merges "Port ctr to use client package" breaks
the use of `ctr run --runtime-config` (by removing that option).

This contains https://github.com/containerd/containerd/pull/954 which was
causing some services to fail to start.

All previous uses of 15541037b9 are updated to
5749f2e9e6.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-07 09:38:10 +01:00
Justin Cormack
d0620eebf9 Merge pull request #1976 from justincormack/containerdup
Containerd update
2017-06-06 22:57:16 +01:00