github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-31 06:34:17 +00:00
Code Issues Projects Releases Wiki Activity
5,867 Commits 1 Branch 29 Tags
c08fe57306718b60d298df8e4bd5d8618d2820d5
Commit Graph

5867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Scott
c29b433780 docker-for-mac: add certificates 
This fixes the error starting the `metadata` package, as described in

Signed-off-by: David Scott <dave.scott@docker.com>
 2017-09-01 11:41:44 +01:00
David Scott
25a05142a3 docker-for-mac: supply the daemon.json via metadata 
Previously the docker-for-mac example had a `files` declaration
which wrote `/var/config/docker/daemon.json`. This was probably an
error because the `/var/config` directory is owned by the `metadata`
package. It used to work -- probably by accident -- but doesn't
any more.

This patch switches to using the metadata package to populate the
`daemon.json`.

Signed-off-by: David Scott <dave.scott@docker.com>
 2017-09-01 11:41:08 +01:00
Rolf Neugebauer
c07309b700 Merge pull request #2472 from rn/base 
tools: Add openssl, attr-dev, and libtirpc-dev to the alpine base image
 2017-08-31 18:53:23 +01:00
Riyaz Faizullabhoy
574fdb1a1b Merge pull request #2471 from rn/kmod-test 
Remove user/references to linuxkit/kernel-compile
 2017-08-31 09:45:24 -07:00
Riyaz Faizullabhoy
fb8a1bf39f Merge pull request #2464 from rn/dock-up 
Update DinD from 17.06.1-ce to 17.07.0-ce
 2017-08-31 09:43:53 -07:00
Riyaz Faizullabhoy
4c9158b714 Merge pull request #2470 from rn/auth 
Update authors file with recent contributors
 2017-08-31 09:42:33 -07:00
Rolf Neugebauer
db6e8bae35 tools: Add openssl, attr-dev, and libtirpc-dev to the alpine base image 
The first is needed by the okernel project and last two to run
configure on the zfs kernel modules.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-31 15:54:12 +00:00
Rolf Neugebauer
2d1242e271 Merge pull request #2465 from t-koulouris/ok_build_updates 
Updates to okernel project build files
 2017-08-31 15:47:22 +01:00
Rolf Neugebauer
608ab6ccf1 docs: Remove reference to linuxkit/kernel-compile 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-31 15:25:41 +01:00
Rolf Neugebauer
f67cb4719a test: Remove kernel-compile from kmod test 
linuxkit/kernel-compile is no longer maintained. Use
the alpine base image instead.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-31 15:21:27 +01:00
Rolf Neugebauer
e26430cfe7 Update authors file with recent contributors 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-31 15:04:18 +01:00
Theo Koulouris
27e8c1145c Streamlined how Makefile handles okernel versions 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-08-31 14:31:41 +01:00
Theo Koulouris
c51f89a600 Removed unused device drivers and options from okernel config file 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-08-31 13:43:39 +01:00
Theo Koulouris
88a2415ff5 Stop using deprecated linuxkit/kernel-compile in okernel build Dockerfile 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-08-31 13:42:07 +01:00
Rolf Neugebauer
fe1aa4659c Merge pull request #2467 from rn/kern-up2 
Update kernels to 4.12.9/4.9.45/4.9.46/4.4.84/4.4.85
 2017-08-31 10:46:22 +01:00
Rolf Neugebauer
15c9bc1144 Merge pull request #2468 from rn/lcow-up 
Update LCOW to latest OpenGCS rev
 2017-08-30 21:04:33 +01:00
Rolf Neugebauer
bd2c9f8b63 blueprints: Update LCOW blueprint 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 19:41:02 +01:00
Rolf Neugebauer
2cb0612011 pkg/lcow: Update OpenGCS to latest 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 19:41:02 +01:00
Rolf Neugebauer
419deee158 Update Linux kernel versions to latest 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 19:23:45 +01:00
Rolf Neugebauer
3fe863e8e6 kernel: Update kernels to 4.9.46/4.4.85 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 19:23:45 +01:00
Rolf Neugebauer
279d3f05bd kernel: Update to 4.4.84/4.9.45/4.12.9 
Note, on x86_64 for 4.12.9 a new kernel option,
HARDLOCKUP_CHECK_TIMESTAMP was added which defaults to enabled. It enables
a low pass filter to compensate for perf based hard lockup detection.

Added this option to the x86_64 4.12.x kernel confog file.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 19:23:45 +01:00
Rolf Neugebauer
bdd4789598 kernel: Fix docker content trust for perf builds 
Due to https://github.com/moby/moby/issues/34199 we can't supply
the FROM image via --build-arg and use DOCKER_CONTENT_TRUST=1 for build.

So we pull the image with DCT and then explicitly build it without.

This regression was introduced with 8b84baf2 ("kernel: Allow disabling content trust")

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 19:23:45 +01:00
Rolf Neugebauer
584acd9fd8 Merge pull request #2461 from ijc/qemu-iso-and-metadata 
qemu: Support ISO boot at the same time as metadata
 2017-08-30 17:54:37 +01:00
Rolf Neugebauer
94cdc5aee8 Update DinD from 17.06.1-ce to 17.07.0-ce 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 16:52:15 +01:00
Rolf Neugebauer
687929a32e blueprints: rename docker-17.06-ce.yml to docker-ce.yml 
Also fix up the corresponding test.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-30 16:52:15 +01:00
Theo Koulouris
2b6f533891 Updates to okernel project build files (multi-stage builds, clean-ups, etc) 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-08-30 15:33:34 +01:00
Ian Campbell
95031cd358 Merge pull request #2462 from ijc/kubernetes-doc-bridge-networking 
kubernetes: document the final step for bridged networking
 2017-08-29 23:40:48 +01:00
Ian Campbell
b34aaee4db kubernetes: document the final step for bridged networking 
Having described all the setup describing the acgual usage seems useful!

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-08-29 21:25:09 +01:00
Ian Campbell
4bdca70c5d qemu: Support ISO boot at the same time as metadata 
Tested with:
 - boot from kernel + initrd with metadata (appears as sr0)
 - boot from iso with no metadata (root is sr0)
 - boot from iso with metadata (root is sr0, metadata is sr1)
 - boot from iso with metadata using containerized qemu

In all cases where it was present the metadata was correctly expanded to
/var/config.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-08-29 21:16:10 +01:00
Ian Campbell
92895c6c16 Merge pull request #2460 from ijc/containerd-v1.0.0-alpha6 
Bump to containerd v1.0.0 alpha6
 2017-08-29 19:14:07 +01:00
Ian Campbell
29e49155f3 scripts: Correct help output 
Using --image is mandatory if you want that mode.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-08-29 01:05:50 +01:00
Ian Campbell
d78321d701 Update hashes for init and containerd 
Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-08-29 01:05:50 +01:00
Ian Campbell
b0b08e18a2 Bump init and containerd packages to v1.0.0-alpha6 
Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-08-29 01:02:20 +01:00
Ian Campbell
6d878dd65f alpine: bump to containerd v1.0.0-alpha6 
Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-08-29 00:39:20 +01:00
Rolf Neugebauer
655aeab873 Merge pull request #2458 from rn/kbuild2 
Further improvements to the kernel build process
 2017-08-24 20:10:33 +01:00
Rolf Neugebauer
719bba5486 docs: Update kernel docs with new build customisation 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-24 18:26:46 +01:00
Rolf Neugebauer
7209afb758 kernel: Enable custom kernel config additions 
For some use cases, we may want to add additional kernel
configuration options (e.g. when adding AUFS). This commit
enables it by:
- renaming DEBUG to EXTRA
- append kernel_config${EXTRA} to the kernel config
- allowing passing in an EXTRA argument to the make file

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-24 18:26:46 +01:00
Rolf Neugebauer
e75cf2f611 kernel: Use -dbg instead of _dbg as suffix for debug kernels 
Otherwise we have a eird mixture of _ and - in the names.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-24 18:26:46 +01:00
Rolf Neugebauer
15d3ce25aa kernel: Add contents of ${DEBUG} to the LOCALVERSION 
This way 'uname -r' will report something like
4.9.44-linuxkit_dbg on debug kernels.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-24 15:10:53 +01:00
Rolf Neugebauer
8b84baf226 kernel: Allow disabling content trust 
specifying NOTRUST=1 on the make command line disables
content trust just like with packages.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-24 15:10:53 +01:00
Rolf Neugebauer
677bf96dff kernel: Fix warning about empty continuation 
Without this change, recent Docker build produce this warning:
[WARNING]: Empty continuation line found in:
    RUN apk add     xz     xz-dev     zlib-dev &&     if [ $(uname -m) == x86_64 ]; then         apk add libunwind-dev;
    fi
[WARNING]: Empty continuation lines will become errors in a future release.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-08-24 11:06:28 +01:00
Justin Cormack
54518101f0 Merge pull request #2451 from justincormack/runtime-mount 
Add support for mount in runtime config
 2017-08-23 19:31:26 +01:00
Justin Cormack
8e652b4656 Merge pull request #2456 from justincormack/missing-case 
Add missing case when running non existent file in hyperkit
 2017-08-23 17:57:42 +01:00
Justin Cormack
24e10defc5 Update moby tool 
This has corresponding changes to support runtime mount changes.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-23 16:44:51 +01:00
Justin Cormack
baf76d5e0c update hashes for init 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-23 16:43:18 +01:00
Justin Cormack
5773dfd844 Cleanup cleanup code 
Only remove main mount at rootfs, as we do not really know
about the state of the rest.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-23 16:40:03 +01:00
Justin Cormack
49cf74f4f6 Switch to having the moby tool specify how to do mounts 
This removes all the code that had knowledge of how to do read only
and read write container mounts, and just uses the runtime config.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-23 16:40:03 +01:00
Justin Cormack
c677b391fc Add support for mount in runtime config 
This could be used in LinuxKit now, as there are some examples, eg
https://github.com/linuxkit/linuxkit/blob/master/blueprints/docker-for-mac/base.yml#L33
which are creating containers to do a mount.

The main reason though is to in future change the ad hoc code that generates
overlay mounts for writeable containers with a runtime config which does
the same thing; this code needs to create both tmpfs and overlay mounts.

See https://github.com/moby/tool/pull/145

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-23 16:40:03 +01:00
Rolf Neugebauer
dfc1068e32 Merge pull request #2455 from rn/4.12 
Initial support for 4.12 kernels (and assorted fixes)
 2017-08-23 16:38:20 +01:00
Justin Cormack
4a374eb175 Add missing case when running non existent file in hyperkit 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-08-23 16:08:30 +01:00