github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity
3,250 Commits 1 Branch 27 Tags 240 MiB
f5732b2cb5
Commit Graph

3250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2388f483c3 Merge pull request #1810 from justincormack/init-clean 
Init clean up
 2017-05-12 16:09:21 +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
Justin Cormack
589d4bff58 Remove some old .gitignore files 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-12 15:25:59 +01:00
Justin Cormack
aa3c4883fa Merge pull request #1809 from justincormack/img-gz 
Add image builder for compressed disk image
 2017-05-12 14:56:45 +01:00
Justin Cormack
fe4b6aaf5d Add image builder for compressed disk image 
This is a fairly generic bootable disk with syslinux. Should
work if you `dd` it onto a USB stick, and should also work for AWS.

You need to uncompress it of course! Default size is 1G.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-12 14:43:55 +01:00
Justin Cormack
b40b0a08cc Merge pull request #1808 from justincormack/mobyup 
Update Moby tool
 2017-05-12 13:24:41 +01:00
Justin Cormack
4746e67b9e Update Moby tool 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-12 13:08:59 +01:00
Rolf Neugebauer
7cac6e57c6 Merge pull request #1806 from MagnusS/memlogd-containerd 
Update logging project to use containerd
 2017-05-11 20:40:45 +01:00
Rolf Neugebauer
122267c6f8 Merge pull request #1803 from ijc25/mkmetadata 
Add `linuxkit metadata create` command
 2017-05-11 20:09:52 +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
Ian Campbell
c1ce8b4688 Consolidate metadata ISO writing into a single function 
Used by both `metadata create` and the hyperkit runner.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-05-11 19:25:28 +01:00
Ian Campbell
36eaa44d7e Add linuxkit metadata command 
Only subcommand is currently `create` which is a thin wrapper to create an iso
file in the format expected by `pkg/metadata`.

Currently very basic and just takes the content on the command line but could
be extended to read from a file etc.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-05-11 19:25:27 +01:00
Justin Cormack
c4da8863fd Merge pull request #1804 from justincormack/containerdup 
Switch to containerd
 2017-05-11 11:41:54 +01: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
716f60f226 Update containerd 
This includes the bug fix that was causing output to be lost much
of the time.

fix #1660

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-11 10:11:18 +01:00
Rolf Neugebauer
54479cb917 Merge pull request #1802 from ijc25/metadata-simple-content 
Metadata fix + a simpler file content option
 2017-05-11 08:18:25 +01:00
Ian Campbell
800badea42 metadata: Allow simple string keys 
If a file is a simple string (as opposed to a map) then write it with the
default perms. This makes for slightly terser metadata when creating a simple
datafile.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-05-11 01:39:03 +01:00
Ian Campbell
8fd1a3cbdb metadata: Fix parsing of JSON 
`ok` was not assigned when type casting to `map[string]interface{}` so the
subsequent check was testing a stale value.

Also, the error message upon failure had the wrong sense.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-05-10 17:37:45 +01:00
Justin Cormack
e0bcac3a28 Merge pull request #1799 from rneugeba/win-script 
scripts: Rename named pipe for the serial port on Hyper-V
 2017-05-10 14:54:46 +01:00
Rolf Neugebauer
3efdc694c5 Merge pull request #1798 from rneugeba/virtsock 
Update virtsock test
 2017-05-10 13:45:14 +01:00
Rolf Neugebauer
008edbb438 scripts: Rename named pipe for the serial port on Hyper-V 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-10 13:36:27 +01:00
Rolf Neugebauer
287653c76d tests: Update virtsock YAML file 
Pick up the new versin of the virtsock test package

Also remove the iso-ios output and adjust the choice of Linux kernels.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-10 13:35:01 +01:00
Rolf Neugebauer
bfd7a62f1f tests: Update virtsock stress test commit 
The new version has improvements to the Windows code as well
as initial support for the VMware/virtio based Hyper-V socket
interface.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-10 13:32:48 +01:00
Justin Cormack
38d21aab4b Merge pull request #1797 from justincormack/init-dirs 
Remove making directories from init
 2017-05-10 12:00:56 +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
Justin Cormack
515b25d518 Do not make directories 
These should now be in the image.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-10 11:00:35 +01:00
Rolf Neugebauer
decbd727d4 Merge pull request #1796 from rneugeba/kern-vsock 
kernel: Fix Hyper-V socket support in 4.11 kernels
 2017-05-09 22:51:50 +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
Rolf Neugebauer
5d88623faf kernel: Fix Hyper-V socket support in 4.11 kernels 
In order to enable Hyper-V sockets, the CONFIG_HYPERV_VSOCKETS
option must be set. This is different to the older kernel patches.

In order for the Hyper-V socket code to compile, f3dd3f4797652c311df
("vmbus: introduce in-place packet iterator") needed cherry-picking.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-09 20:49:24 +01:00
Rolf Neugebauer
e98e6fc0ba Merge pull request #1795 from jeffrey-hogan/GCP_README_TYPO 
Correct gcp.yml Example URL Path
 2017-05-09 19:52:15 +01:00
Jeffrey Hogan
50875c5a21
Correct gcp.yml example URL path 
Signed-off-by: Jeffrey Hogan <jeff.hogan1@gmail.com>
 2017-05-09 13:12:35 -05: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
b39e477c10 Merge pull request #1793 from justincormack/mobyup 
Update moby tool to fix symlinks handling
 2017-05-09 14:08:53 +01:00
Justin Cormack
5c792e791a Merge pull request #1790 from justincormack/docker-17.05 
Update to Docker 17.05
 2017-05-09 13:57:48 +01:00
Justin Cormack
6dced3a196 Update moby tool to fix symlinks handling 
Symlinks were being handled incorrectly in initrd output.

Fix #1792

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-09 13:54:38 +01:00
Justin Cormack
ad8a4cad1f Merge pull request #1791 from justincormack/initrd-symlink-cleanup 
Clean up initrd creation library
 2017-05-09 13:44:34 +01:00
Justin Cormack
56e30fdbc5 Clean up initrd creation library 
Remove duplicated code and clean up file handling a little.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-09 13:30:14 +01: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
9e879dc56a Update Docker to 17.05.0-ce 
This includes nested build support so we can look at starting to dogfood.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-09 11:08:16 +01:00
Rolf Neugebauer
b848b40687 Merge pull request #1789 from justincormack/go-in-alpine 
Multistage builds for containerd and runc
 2017-05-08 23:31: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
Justin Cormack
f2fc503bb0 Add Go to linuxkit/alpine 
Note this is currently Go 1.7.4 but should be updated soon to 1.8.1.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-08 22:03:02 +01:00
Justin Cormack
8269292398 Merge pull request #1788 from justincormack/containerd-up 
Update containerd
 2017-05-08 22:02:25 +01:00
Justin Cormack
b70ca67931 Remove dist tool from containerd 
It is 20MB and we don't use it...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-08 21:12:12 +01:00
Justin Cormack
c73f9b3e6b Update containerd 
My patch has been merged so may as well use upstream.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-08 21:10:54 +01:00
Justin Cormack
618c86fcc9 Merge pull request #1786 from justincormack/mobyup 
Update moby tool
 2017-05-08 20:32:39 +01:00