Commit Graph

3833 Commits

Author SHA1 Message Date
Justin Cormack
50785b4be7 Merge pull request #2103 from justincormack/make-cleaner
Makefile cleanups
2017-06-26 16:41:30 +01:00
Justin Cormack
3f5c236de7 Add a target for the cross build tests and make parallel
Trying to speed up build a bit.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-26 13:39:47 +01:00
Justin Cormack
fb4c168af7 Merge pull request #2102 from ijc/getty-and-ssh-improvements
Getty and ssh improvements
2017-06-26 13:38:59 +01:00
Justin Cormack
50c3c38a18 Clean up Makefile
- clean up incorrect lines such as `tar xf tmp_linuxkit_bin.tar > $@`
- split out targets to make tarballs and to untar

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-26 13:29:37 +01:00
Ian Campbell
b6071df200 Update getty and sshd sha's in *.yml to current.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-26 11:52:41 +01:00
Ian Campbell
bbbbf3cb5d sshd: sync bind mounts with getty container
This adds all the binds from pkg/getty/Dockerfile to pkg/sshd/Dockerfile and
retains the existing /root/.ssh and /etc/resolv.conf binds.

With this `dist` and `ctr` function in a ssh session.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-26 11:52:41 +01:00
Ian Campbell
2864f467b9 getty,sshd: Include ca-certificates.
Otherwise:

    dist pull docker.io/library/redis:alpine
    dist: failed to do request: Head https://registry-1.docker.io/v2/library/redis/manifests/alpine: x509: failed to load system roots and no roots provided

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-26 11:52:41 +01:00
Ian Campbell
34fbe42615 getty,sshd: Mount host /tmp into containers.
ctr (which runs in the getty or ssh container) relies on sharing files in /tmp
with containerd (which runs in the host mount namespace). Specifically it
currently uses paths under /tmp/containerd for the stdio FIFOs of containers, resulting in:

    # ctr run -t docker.io/library/redis:alpine test
    ctr: rpc error: code = Unknown desc = runtime create failed: runc create failed: container with id exists: test

Currently it is not possible to specify a non-existent source directory for a
bind mount, so we cannot easily bind just /tmp/containerd. Sharing all of /tmp
doesn't sound like a terrible idea anyway.

Defering updating the sha in *.yml until after some further changes to these packages.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-26 11:52:41 +01:00
Ian Campbell
ea79748830 pkg/containerd: Add /etc/localtime set to UTC
containerd/ctr includes this in the default set of bind mounts for a container.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-26 11:52:30 +01:00
Ian Campbell
e880052d35 alpine: Add tzdata to mirror.
Moved qemu-img to keep list fully alphabetical.

Rebuild pushed as linuxkit/alpine:c96f56ef989ccb31fd115d25c1b90f05b992271d

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-26 11:51:27 +01:00
Justin Cormack
8be67983ff Merge pull request #2100 from justincormack/no-efi-test
Disable Qemu EFI ISO test for now
2017-06-23 11:50:35 -07:00
Justin Cormack
c2bd284ccb Disable Qemu EFI ISO test for now
See #1872 this is very flaky and without a controlled known
working environment this is not helpful.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-23 09:46:45 -07:00
Justin Cormack
f077c7c7f7 Merge pull request #2095 from rn/kern-up
Kernel and kernel config update
2017-06-23 09:45:05 -07:00
Rolf Neugebauer
8d4dfb25e6 test: Load modules before testing for filesystems
The previous commit moved some filesystems to kernel modules.
modprobe them before checking if they are enabled.

Also update the YAML files for the tests.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-22 23:31:39 +01:00
Rolf Neugebauer
492b6c3fdb kernel: Move some less commonly used features to modules
Module loading on hotplug and boot seems to work now, so
move some less commonly used kernel features and drivers
out of the kernel into drivers. Specifically:
- Devices: All non-virtual network device drivers
- Networking: GRE, GENEVE, PPP, non-essential IPv6 protos,
  L2TP, MPLS_GSO, bonding, IPSec (XFRM), openvswitch,
  queueing/schedulers
- FS: SUNRPC, NFS, NFSD, LOCKD, NTFS
- Misc: ATA over Ethernet

Remove Nozomi serial driver. It doesn't seem to be used
on any of our platforms.

The config files were also run through 'make defconfig &&
make oldconfig' to update any missing options.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-22 19:32:13 +01:00
Rolf Neugebauer
4d8f8956b3 kernel: Update to 4.11.6/4.9.33/4.4.73
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-22 19:32:13 +01:00
Rolf Neugebauer
974bc56886 kernel: Remove elfutils-dev package
It clashes with libelf-dev but libelf-dev is sufficient
to compile the kernel. This also allows us to remove the
'|| true' from the 'apk add', catching errors with the
tools installation.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-22 19:32:12 +01:00
Riyaz Faizullabhoy
125469a4c5 Merge pull request #2093 from MagnusS/add-dfm-build-test
tests: add build test for Docker for Mac blueprint
2017-06-22 09:24:35 -07:00
Justin Cormack
6cfc0ad7b2 Merge pull request #2094 from samoht/typo
Fix typo in report
2017-06-22 09:20:57 -07:00
Thomas Gazagnaire
e1ab0e75a9 Replace Solar5 by Solo5
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-22 17:26:59 +02:00
Thomas Gazagnaire
83d615e2d1 Remove spaces in report
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-22 17:26:39 +02:00
Magnus Skjegstad
7bbc39374e tests: add build test for Docker for Mac blueprint
Adds a new test group "linuxkit.build.blueprints" and a test for
building blueprints/docker-for-mac.yml.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-22 16:30:31 +02:00
Rolf Neugebauer
d65bb86c37 Merge pull request #2080 from dave-tucker/pkg-mk
Simplify Makefiles for Packages
2017-06-22 13:35:43 +01:00
Dave Tucker
adae27b8d1 Simplify Makefiles for Packages
These now inherit from a top-level package.mk
Options like use of the network can be enabled on a per package basis
This removes a lot of duplicate code and make the maintenace of these
Makefiles much easier

Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-22 12:40:03 +01:00
Rolf Neugebauer
db91f9d817 Merge pull request #2091 from riyazdf/alpine-base-update
alpine: include gnupg and zfs packages
2017-06-22 00:36:41 -07:00
Justin Cormack
71a89a1de0 Merge pull request #2090 from justincormack/summit-report
Add notes from BoF at Summit
2017-06-21 22:41:37 -07:00
Riyaz Faizullabhoy
130800446a alpine: add zfs package
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-21 17:54:45 -07:00
Riyaz Faizullabhoy
6b5ef8c70e alpine: include gnupg package
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-21 17:49:51 -07:00
Riyaz Faizullabhoy
177d931144 Merge pull request #2089 from riyazdf/sig-video-landlock
sig-security: add video link
2017-06-21 17:43:12 -07:00
Justin Cormack
0ea861fecd Add notes from BoF at Summit
Thanks to @mgoelzer for note taking.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-21 17:37:08 -07:00
Riyaz Faizullabhoy
d0af1d979d sig-security: add video link
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-21 16:13:05 -07:00
Riyaz Faizullabhoy
992e5e74f0 Merge pull request #2087 from riyazdf/sig-meeting-notes
sig-security: add meeting notes for 2017-06-21
2017-06-21 13:41:24 -07:00
Riyaz Faizullabhoy
45b4d0d054 sig-security: add meeting notes for 2017-06-21
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-21 10:58:46 -07:00
Rolf Neugebauer
50ee00c239 Merge pull request #2084 from thaJeztah/update-ascii-logo
Update ASCII whale
2017-06-21 09:08:56 -07:00
Sebastiaan van Stijn
4e1c91fc6e
Update ASCII whale
The logo changed, and no longer has waves,
so removing them from the ASCII whale as well

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-20 23:22:23 -07:00
Rolf Neugebauer
7c25c119bb Merge pull request #2083 from riyazdf/linus-key
Add PGP key for 00411886 (torvalds@linux-foundation.org)
2017-06-20 13:36:07 -07:00
Rolf Neugebauer
e27b08694d Merge pull request #2082 from davefreitag/deadlink
Fix Dead Link to VMWare File
2017-06-20 11:07:35 -07:00
Justin Cormack
95c0c290df Merge pull request #2074 from ndauten/master
FIX Docs Link: ./kernel to ../kernel/README.md
2017-06-20 10:59:42 -07:00
Riyaz Faizullabhoy
503c08a6fb Add PGP key for 00411886 (torvalds@linux-foundation.org)
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-20 10:05:33 -07:00
Justin Cormack
4b124b5611 Merge pull request #2062 from rn/AkihiroSuda-containerd-test
Akihiro suda containerd test
2017-06-20 09:52:58 -07:00
Dave Freitag
14bc80db56 Fix Dead Link to VMWare File
Fixing a typo in the main README.md that was causing a dead link to the
platform-vmware.md file.

Signed-off-by: Dave Freitag <dcfreita@us.ibm.com>
2017-06-20 11:52:23 -05:00
Justin Cormack
324605c48c Merge pull request #2068 from mscribe/master
Verify kernel with GPG and sha256 checksum
2017-06-20 09:50:47 -07:00
Nathan Dautenhahn
a15fbc9464 docs/kernels.md: point link to proper directory
Signed-off-by: Nathan Dautenhahn <ndd@cis.upenn.edu>
2017-06-20 12:49:47 -04:00
Justin Cormack
7258e09b1f Merge pull request #2079 from ndauten/ndd-makefile-fix
Fix spelling errors
2017-06-20 09:25:30 -07:00
Justin Cormack
f6af4e00c9 Merge pull request #2077 from dave-tucker/rtf-up
Update RTF version
2017-06-20 09:25:02 -07:00
Nathan Dautenhahn
4c73320c75 Fix spelling errors
inuxkit/kernel -> linuxkit/kernel

sourcs -> sources

Signed-off-by: Nathan Dautenhahn <ndd@cis.upenn.edu>
2017-06-20 05:54:26 -04:00
Dave Tucker
367ec52855 Update RTF version
This brings updated help text and fixes handling of labels as reported
in https://github.com/linuxkit/rtf/issues/16

Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-20 09:29:52 +01:00
Nathan Dautenhahn
6ba3d13e6f FIX Docs Link: ./kernel to ../kernel/README.md
Signed-off-by: Nathan Dautenhahn <ndd@cis.upenn.edu>
2017-06-19 16:37:50 -04:00
Bill Kerr
1e1afd77d2
Add PGP keys for 589DA6B1 (greg@kroah.com) and 6092693E (autosigner@kernel.org).
Verify kernel with GPG and sha256 checksum.

Signed-off-by: Bill Kerr <bill@generalbill.com>
2017-06-19 16:29:53 -04:00
Riyaz Faizullabhoy
b69bcec0e9 Merge pull request #2073 from riyazdf/sig-announcement-link
sig-security: add forum link to announcement
2017-06-19 11:36:58 -07:00