Commit Graph

3272 Commits

Author SHA1 Message Date
Justin Cormack
e26c2a968e Merge pull request #1826 from rneugeba/kernup
kernel: Update to 4.11.1/4.10.16/4.9.28/4.4.68
2017-05-15 11:01:54 +01:00
Rolf Neugebauer
5f5c27cbba kernel: Update to 4.11.1/4.10.16/4.9.28/4.4.68
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-15 10:34:02 +01:00
Justin Cormack
b86fcd5253 Merge pull request #1813 from thebsdbox/vmware_disk_fix
Added matching capability to create a disk
2017-05-14 10:39:54 +01:00
thebsdbox
3e9a0ae94c Added matching capability to create a disk
- What I did
Added the capability to re-use or create a disk from the linuxkit
VMware cli

- How I did it
Using the vmware-diskmanager that comes with Fusion/Workstation

- How to verify it
Run linuxkit run vmware with the -disk -disk-size arguments

- Description for the changelog
Persistent disk functionality added into the VMware backend.

- A picture of a cute animal (not mandatory but encouraged)
nope

Signed-off-by: Dan Finneran <daniel.finneran@gmail.com>
2017-05-13 19:29:55 +01:00
Riyaz Faizullabhoy
cd2b07a697 Merge pull request #1820 from justincormack/authorsup
Update AUTHORS
2017-05-13 09:46:49 -07:00
Justin Cormack
35f741f410 Update AUTHORS
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-13 14:00:39 +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
Justin Cormack
4d79ddb0ed Merge pull request #1815 from jadametz/fix-1814
Add rm flag to projects/kubernetes ssh script
2017-05-12 23:04:57 +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
Rolf Neugebauer
65885ea9a0 Merge pull request #1783 from dave-tucker/rtf-cases
[WIP] Add a test suite 
2017-05-12 21:44:14 +01:00
Dave Tucker
ce2bdea399 Add a test suite
This adds a test suite to be executed using `linuxkit/rtf`.
This is installed in the top-level Makefile

The tests are written in shell script and cover the following cases:

- Kernel Config is OK!
- Kernel Modules can be built and loaded
- QEMU can build and run kernel+initrd, iso-bios and iso-uefi
- That we can build for all other supported output formats
- That all of the examples in `./examples` can be built
- The LTP tests can be run (if `-l slow` is provided)

The virtsock and docker-bench tests were migrated but no test has been
written as yet as AFAICT they are still a WIP

Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-12 20:12:59 +01:00
Dave Tucker
7027dc814c Fix path handling in QEMU to allow containers outside the PWD
Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-12 20:12:59 +01: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
Riyaz Faizullabhoy
a11c373f0c Merge pull request #1811 from ijc25/runc-workdir-workaround
pkg/runc: WORKDIR as first item in second stage
2017-05-12 11:42:22 -07: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
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