Commit Graph

4395 Commits

Author SHA1 Message Date
Avi Deitcher
8de1d9bf2c Mount /var/log to getty and ssh again
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-21 19:11:22 +03:00
Ian Campbell
e2daca734f swarmd: Update yml for swarmd package
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-21 16:35:49 +01:00
Ian Campbell
c17cf1f969 swarmd: Update swarmd package to current docker/swarmkit#2299
The PR has been rebased to containerd v1.0.0-alpha1.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-21 16:13:12 +01:00
Ian Campbell
b348957068 swarmd: Update to Weave 2.0.1
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-21 16:12:55 +01:00
Ian Campbell
85f0f008a9 swarmd: update getty to latest
Matching top-level linuxkit.yml

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-21 16:12:33 +01:00
Justin Cormack
36eedaa3f0 Merge pull request #2171 from ndauten/add-memorizer
memorizer: initial build setup
2017-07-21 15:27:05 +01:00
Rolf Neugebauer
3219daa674 Merge pull request #2264 from tych0/support-tap-qemu
support tap devices in qemu backend
2017-07-21 10:56:24 +01:00
Riyaz Faizullabhoy
6031c4bf5f Merge pull request #2266 from zx2c4/add-wireguard-to-sshd-getty
Add wireguard to sshd and getty
2017-07-20 17:09:29 -07:00
Riyaz Faizullabhoy
ddad2443d0 Merge pull request #2268 from riyazdf/update-alpine-base-versions
tools/alpine: update version
2017-07-20 17:08:53 -07:00
Jason A. Donenfeld
ec7dadcddd wireguard: add to getty and sshd
People really want to play around with this, so adding them here makes
it possible. Just as iproute2 is part of these, so should
wireguard-tools.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-07-20 23:50:13 +02:00
Riyaz Faizullabhoy
950a1b586b Merge pull request #2265 from zx2c4/wireguard-tools-as-package
wireguard: add tools to alpine as package not into filesystem
2017-07-20 14:39:27 -07:00
Riyaz Faizullabhoy
e2289984ac tools/alpine: update version
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-07-20 14:39:23 -07:00
Nathan Dautenhahn
b47c64f525 Add Memorizer to projects
This commits an initial version of the Memorizer tracing tool. It collects and
outputs detailed data on the objects (traced from kmalloc/kmem_cache_alloc) and
accesses, tracking the context of each event with respect to thread ID, program
counter, and for allocations name of process.

Signed-off-by: Nathan Dautenhahn <ndd@cis.upenn.edu>
2017-07-20 16:05:03 -04:00
Jason A. Donenfeld
a837a6fc65 wireguard: add tools to alpine as package not into filesystem
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-07-20 22:01:05 +02:00
Justin Cormack
78e5ddc675 Merge pull request #2255 from thebsdbox/openStack_Push
OpenStack Push support
2017-07-20 19:46:52 +01:00
Tycho Andersen
d237c92273 support tap devices in qemu backend
The motivation for this is networking out (in particular, testing NFS
support) from the VM.

We could be a lot more user friendly (a la libvirt) by creating the tap
device for users and allowing them to specify a bridge instead, but then
we'd need root to create this tap device. For now, let's make people do
their own tap devices, and just use them. A tap device can be created for a
bridge as follows:

    # ip tuntap add linuxkit0 mode tap user `whoami`
    # ip link set linuxkit0 up
    # ip link set linuxkit0 master $bridge_name

and then used by:

    $ ./bin/linuxkit run qemu -tap-device linuxkit0 linuxkit

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-07-20 12:40:07 -06:00
Tycho Andersen
9fa0647539 update test-kernel-config hash
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-07-20 11:26:27 -06:00
Rolf Neugebauer
c76096e4d5 Merge pull request #2259 from ijc/apk-in-login-packages
Add apk to login (sshd & getty) containers
2017-07-20 16:50:58 +01:00
Rolf Neugebauer
3ca12fa014 Merge pull request #2249 from zx2c4/default-wireguard
Add wireguard to core of LinuxKit
2017-07-20 16:50:48 +01:00
thebsdbox
41f2d2c256 OpenStack Push support
Signed-off-by: Dan Finneran <daniel.finneran@gmail.com>
2017-07-20 16:24:48 +01:00
Jason A. Donenfeld
332c4edf62 wireguard: move documentation into docs/
Now that this isn't a project, we move the last remains into the right
place.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-07-20 16:51:53 +02:00
Jason A. Donenfeld
a09a2a4b22 wireguard: integrate tools into alpine
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-07-20 16:51:53 +02:00
Jason A. Donenfeld
e24cc5c77f wireguard: add into default kernel
This integrates the WireGuard module directly into the kernel build
system.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-07-20 16:51:18 +02:00
Ian Campbell
d01aa72670 Update ymls
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 15:08:27 +01:00
Ian Campbell
c48acd5d9d sshd+getty: Add apk to these containers
Since these are the user login containers, having the ability to add packages
is useful (e.g. I quite often find I want strace).

Doing this requires that we not share `/var` with the login containers since we
want the apk database therein. Previously it was thought that the containers
might need some parts of `/var` for `ctr` to work (e.g. `/var/lib/containerd`)
but this is not the case now (if it ever was) based on my testing.

Fixes #2206.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 15:08:27 +01:00
Justin Cormack
5545f3085a Merge pull request #2258 from ijc/containerd-v1.0.0-alpha1
Containerd v1.0.0 alpha1
2017-07-20 15:07:24 +01:00
Ian Campbell
19207bb81b Update yml and moby version
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 14:13:20 +01:00
Ian Campbell
b3db1a887c Update to containerd v1.0.0-alpha1
This is actually containerd#1141 rebased onto v1.0.0-alpha1.

The `dist` command has been integreated into `ctr` and so is removed, including
from the getty and sshd bind mounts and the test which uses it is updated..

There is no change to the version of runc vendored by containerd, so this is
unchanged.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 14:10:51 +01:00
Ian Campbell
ddb9efbffb alpine: Include xfsprogs-extra
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 14:10:51 +01:00
Rolf Neugebauer
c1eacd07b7 Merge pull request #2256 from djs55/secrets
metadata: avoid printing large chunks of configuration json to the console
2017-07-20 13:17:50 +01:00
Rolf Neugebauer
ccb03c465b Merge pull request #2257 from rn/lcow-merge
LCOW: Use master of the main opengcs repo again
2017-07-20 12:12:40 +01:00
David Scott
13ff6d5d94 Update to linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79
Signed-off-by: David Scott <dave.scott@docker.com>
2017-07-20 11:24:18 +01:00
Rolf Neugebauer
d1b19a98f0 blueprints: Update LCOW to latest hash
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-20 11:11:29 +01:00
David Scott
5bf6526380 metadata: avoid printing large chunks of configuration json to the console
If the configuration .json has contents like:

{
  "etc": {
    "ssl": {
      "certs": {
        "ca-certificates.crt": {
          "perm": "0644",
          "content": "large amount of certificate text"
        }
      }
    }
  },
...
}

then we print a warning because the node "ssl" has no "perm".
Previously the warning would include the contents of "ssl", which
would be large (and in theory could include secret information).

This patch modifies the warning print to only print the key and
not the value.

Without this patch, I see on the console:

2017/07/20 10:03:04 CDROM: Probe succeeded
2017/07/20 10:03:04 No permission provided ssl:map[certs:map[ca-certificates.crt:map[perm:0644 content:large amount of certificate text]]]
 - 000-metadata

With this patch, I see on the console:

2017/07/20 09:54:18 CDROM: Probe succeeded
2017/07/20 09:54:18 No permission provided ssl
 - 000-metadata

Signed-off-by: David Scott <dave.scott@docker.com>
2017-07-20 11:10:59 +01:00
Rolf Neugebauer
c28a472ba2 pkg/init-lcow: Use main opengcs repository again
My patches have been merged.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-20 11:02:05 +01:00
Justin Cormack
de11ea12ac Merge pull request #2254 from riyazdf/wireguard-video
sig-security: add youtube video and forum link
2017-07-20 08:40:49 +01:00
Justin Cormack
82caa88c59 Merge pull request #2253 from tych0/wireguard-overhead-correction
correct the calculation of wireguard header overhead
2017-07-20 08:40:26 +01:00
Riyaz Faizullabhoy
fca8e6f6b2 sig-security: add youtube video and forum link
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-07-19 16:49:23 -07:00
Tycho Andersen
b247cf5a68 correct the calculation of wireguard header overhead
Thanks to Jason Donenfeld for the correction.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-07-19 17:29:27 -06:00
Tycho Andersen
6ff8a7387f check-kernel-config: check for STRICT_MODULE_RWX too
This is what CONFIG_DEBUG_SET_MODULE_RONX was renamed to; since we want
that one, presumably we want this one too.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-07-19 14:08:25 -06:00
Justin Cormack
4fb767a480 Merge pull request #2248 from tych0/sig-security-2017-07-19
sig-security: add notes from 2017-07-19
2017-07-19 20:00:46 +01:00
Tycho Andersen
c420e3285d sig-security: add notes from 2017-07-19
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-07-19 11:58:41 -06:00
Rolf Neugebauer
83f079eb8b Merge pull request #2247 from zx2c4/update-wireguard
wireguard: update to latest snapshot
2017-07-19 16:25:06 +01:00
Rolf Neugebauer
6059865a23 Merge pull request #2246 from ijc/refresh-go-compile
Update to latest alpine base for go-compile
2017-07-19 15:47:52 +01:00
Jason A. Donenfeld
0441a379af wireguard: update links
WireGuard moved from .io to .com.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-07-19 16:27:59 +02:00
Rolf Neugebauer
35e274c7d8 Merge pull request #2245 from rn/lcow-init
Additional LCOW fixes
2017-07-19 15:27:01 +01:00
Justin Cormack
4c63a0ddf6 Merge pull request #2239 from ijc/kubernetes
kubernetes: modernise image-cache build, shrink size by 100M each
2017-07-19 15:15:58 +01:00
Jason A. Donenfeld
6e0da8877b wireguard: update to latest snapshot
It's slightly embarrassing that this old snapshot was kept around here
rotting for so long, but thankfully something is finally being done
about it.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-07-19 16:15:15 +02:00
Ian Campbell
a24819f2e5 Update to latest alpine base for go-compile
I noticed that running the runes in docs/vendoring.md made a bunch of files
which are omitted by modern vndr come back, presumably due to the old version
of vndr referenced there. So update the go-compile package to the current
version everywhere.

Also correct the use of `make` variable syntax (`$(PWD)`) where shell syntax
command substitution for `pwd` was desired.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-19 14:40:24 +01:00
Rolf Neugebauer
4e4ab770c7 blueprint: Update LCOW YAML blueprint
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-19 14:20:33 +01:00