Commit Graph

268 Commits

Author SHA1 Message Date
Rolf Neugebauer
9bdfcb5b12 Update YAML files with new packages, config, and trust data
- Update to packages using the Alpine 3.6 base image
- Remove config for packages which now supply it
- Update/add trust section

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-26 16:23:55 +01:00
Justin Cormack
00737bd859 Remove outputs from the yaml files
The latest version of the `moby` tool now requires that the output formats
be specified in the CLI not in the yaml file.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-26 13:55:06 +01:00
Justin Cormack
8d97247d8c Merge pull request #1877 from tych0/real-kernel-config-impl
kernel-config project: add a real implementation of kernel configs
2017-05-24 16:16:33 +01:00
Rolf Neugebauer
ae5dfc6d7d Update all YAML files to use the new binfmt, dhcpcd and rngd packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-23 15:55:40 +01:00
Tycho Andersen
ef4bd01de8 kernel-config project: add draft of kernel configs
The kernel configs themselves are stored as diffs of what we want vs. each
version's defconfig.

Thus, things like e.g. CONFIG_DEVKMEM drop out after it was made
non-default. The implication of this is (I hope) that as upstream adopts
security features, our delta can shrink (or more realistically, only
include the next-next gen features).

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 17:51:09 -06:00
Tycho Andersen
d6269d8504 kernel-config project: add kcimport script
This is the script I used with [1] to generate the config diffs and
separate out the arch specific bits. Included mostly just so people can
play around with it if they want to generate their own diffs.

[1]: https://github.com/ulfalizer/Kconfiglib

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Tycho Andersen
8a140cefd8 projects: update list of kernels in kernel-config
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Tycho Andersen
ee4d74aca6 projects: be more clever about merging kernel config
In particular, let's start with a defconfig and edit it, rather than try to
generate the config entirely from our own diff.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Tycho Andersen
e60f9d3946 projects: run check-kernel-config.sh at kernel build time
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-22 16:58:50 -06:00
Rolf Neugebauer
a6d834ddf0 Merge pull request #1865 from justincormack/go-compile
more Go compile fixes
2017-05-21 11:18:45 +01:00
Rolf Neugebauer
4377ae3209 Merge pull request #1861 from justincormack/containerd-build
Update containerd
2017-05-21 11:13:07 +01:00
Justin Cormack
e52bf2f745 Update sysctl and sysfs in yaml files
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-20 11:16:48 +01:00
Justin Cormack
702ad5d9d9 Update git hashes for sysctl
And remove all the config options as they are now in the label.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 22:05:15 +01:00
Justin Cormack
a3ea4646e5 Update containerd in yaml files
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-19 11:52:12 +01:00
Justin Cormack
ac31862c42 Merge pull request #1857 from tych0/add-ima-project
projects: add IMA namespacing project
2017-05-18 22:12:02 +01:00
Tycho Andersen
3fd6337a45 ima: use ima-utils package instead of new init
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-18 13:44:04 -06:00
Tycho Andersen
4b29c738e0 projects: add a blurb about ima namespacing
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-18 13:43:59 -06:00
Tycho Andersen
d80e880f28 projects: add IMA namespacing project
This is a project with a v1 of the IMA namespacing patches. See the readme
for details on use.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-18 12:25:07 -06:00
Rolf Neugebauer
6bea56c185 Update all YAML files to use the new packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-18 18:55:22 +01:00
Justin Cormack
5eff65a688 Merge pull request #1818 from jadametz/fix-1817
Specifies root user in projects/kubernetes ssh_into_kubelet script
2017-05-13 10:21:56 +01:00
Jesse Adametz
547e2dca95 Specifies root user in projects/kubernetes ssh_into_kubelet script
Signed-off-by: Jesse Adametz <jesseadametz@gmail.com>
2017-05-12 15:17:26 -07:00
Justin Cormack
60500940ab Merge pull request #1816 from ijc25/swarmd
projects/swarmd: Updates
2017-05-12 23:06:21 +01:00
Jesse Adametz
2ece5ac28a Add rm flag to projects/kubernetes ssh script
Signed-off-by: Jesse Adametz <jesseadametz@gmail.com>
2017-05-12 14:25:18 -07:00
Ian Campbell
0fb3d1c6e9 Updated swarmd commit
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:48:52 +01:00
Ian Campbell
a28d34f18c Modernise swarmd pkg build
Uses multi stage builds and the tree-sh as tag.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:48:01 +01:00
Ian Campbell
5eee4c0607 pkg/runc: WORKDIR as first item in second stage
Works around https://github.com/moby/moby/issues/33176 and fixes #1807.

Updated al users of linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 to
this new build.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:23:27 +01:00
Ian Campbell
1b31a0ea3b swarmd: Mount persistent disk on /var/lib/swarmd
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:11:45 +01:00
Ian Campbell
14b0c00133 swarmd: Switch to oneshot DHCP
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:11:45 +01:00
Ian Campbell
6c87493ec5 swarmd: Add metadata service
Also update other users of linuxkit/metadata to the newest build while I'm
here.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:10:49 +01:00
Ian Campbell
5b0f92fb9e swarmd: Update to latest images (from linuxkit.yml)
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:02:25 +01:00
Ian Campbell
f5732b2cb5 swarmd: Add ntpd
Follows https://github.com/docker/moby/pull/1576

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:02:25 +01:00
Ian Campbell
8e90e67eea swarmd: host pid namespace for CNI access to /proc/PID/ns/net
Since containers are spawned by containerd (which is in the host PID namespace)
and not in the swarmd container's namespace.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-12 19:02:23 +01:00
Justin Cormack
6a5f8099a4 Remove extra files from init
fix #1807

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-12 15:36:13 +01:00
Magnus Skjegstad
1da0b14e23 logging: update example to use latest init/containerd
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-11 21:08:23 +02:00
Magnus Skjegstad
37ddf42b5b logging: add log capture to onboot and service startup
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-11 21:07:58 +02:00
Magnus Skjegstad
4a9a5afd03 logging: update init scripts to latest version with containerd
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-11 20:59:55 +02:00
Justin Cormack
66d6d3a6e3 Update containers to use containerd
Now the issues seem fixed, switch over to containerd.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-11 11:25:06 +01:00
Justin Cormack
b14f8a2337 Update yaml files with new init
Note these are only the ones using the `containerd` based `init` as
the `runc` ones are still using an old one.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-10 11:39:29 +01:00
Rolf Neugebauer
477a56432b Merge pull request #1787 from tych0/kernel-config
projects: add a project that re-works how we manage kernel config
2017-05-09 20:56:53 +01:00
Tycho Andersen
1c10661069 collapse kernel build back into one file
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-09 11:13:32 -06:00
Justin Cormack
9ca3ba489a Update yaml files to new Docker CE
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-09 11:12:39 +01:00
Justin Cormack
61bbbf0808 Change containerd and runc to use multistage builds from new Alpine base
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-08 22:37:59 +01:00
Tycho Andersen
9cd2f434cf projects: remove unused configs from kernel-config
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-08 12:06:25 -06:00
Tycho Andersen
42b6b44fa9 projects: split kernel-config build into three phases
...and add straw man implementations of kernel_config.base and
kernel_config.x86 as examples.

First, splitting the build: to avoid duplication, we split the build into
three parts: a "source" stage, a "config" stage, and a "build" stage. The
"source" stage allows us to use a cached image, so we don't have to
re-download the kernel source every time. The "config" step applies our
patches and generates (and checks) the kernel config. I've left this as a
separate step for now so that we can build just an image with a config in
it, without having to ^C the build. However there's no real reason it needs
to be a separate step, assuming that this kernel config design is
acceptable. The third step is the actual kernel build.

Then there is kernel config management: the bulk of it occurs in
makeconfig.sh, with the idea being that we can specify base, arch, and
version specific config options as necessary.

The config files themselves are lists of options (both positive and
negative). We include the negative options, because we want to explicitly
turn off things that are on in the default config (e.g. CONFIG_USELIB), and
it seems cleaner to do things this way then to have some sort of negative
options list.

The options files are sorted with the default behavior of the "sort"
command, which ignores comment lines, meaning that negative options and
positive options are inline with each other. I don't have a strong opinion
on whether or not to group all negative options, or whether this default
behavior makes sense, so I just left it.

Finally, obviously the .base and .x86 files are incomplete. I mostly
selected a few options with interesting dependencies or special issues
(CONFIG_PANIC_ON_OOPS) with how we manage things, so as to demo how
everything would work. It's not really clear to me that there's a good way
to generate e.g. kernel_config.base, without a lot of painstaking work
(which I'm happy to do if we agree this is a good approach).

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-08 12:06:25 -06:00
Tycho Andersen
1e0021d969 projects: add kernel-config project
This is just a direct import of the current kernel/ directory, with a
slight splitting up of the dockerfiles to build a kernel-source and kernel
image.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-08 12:06:25 -06:00
Rolf Neugebauer
423957cfef Update YAML files to new packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-08 16:49:39 +01:00
Rolf Neugebauer
21f1646ce2 Update YAML files with new package hashes
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-04 22:27:59 +01:00
Nathan Dautenhahn
f8f9ed9965 Spelling error: Dautenhan -> Dautenhahn
Signed-off-by: Nathan Dautenhahn <ndd@cis.upenn.edu>
2017-05-03 14:04:29 -04:00
Justin Cormack
3bd53067fb Update yaml files with new ca-certificates
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-03 16:43:24 +01:00
Ian Campbell
bb50dd9781 projects/kubernetes: Allow linuxkit to pick default backend
Drop `hyperkit` from the `linuxkit run` invocation, thus causing the linuxkit
tool to pick the platform's default backend (which is qemu on my Linux system,
which works better than hyperkit in this environment).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-03 09:11:32 +01:00