Commit Graph

5397 Commits

Author SHA1 Message Date
Phil Estes
9212c5d589
Remove containerd config from shiftfs.yaml
No need to have a special containerd daemon config file; might have been
a vestige of earlier variants of LinuxKit? It is also out of date and
incorrect for current containerd version.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-12-07 23:15:35 -06:00
Rolf Neugebauer
9aa8a4362f
Merge pull request #2801 from rn/kern-up
Update kernels to 4.14.4/4.9.67.4.4.104
2017-12-06 15:46:53 +00:00
Rolf Neugebauer
e7c1824a97 Update YAML files to new kernel versions
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-06 14:10:11 +00:00
Rolf Neugebauer
ea78cf64a4 docs: Don't mention full versions of 'linuxkit/kernel'
These get out of sync when doing a mechanic update of
kernel tags.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-06 14:07:30 +00:00
Rolf Neugebauer
4a5e06a033
Merge pull request #2797 from pcfdev-forks/vpnkit-path
Allow vpnkit executable path to be specified
2017-12-06 13:23:45 +00:00
Rolf Neugebauer
53127d7209 kernel: Update to 4.14.4/4.9.67/4.4.104
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-06 10:11:50 +00:00
Rolf Neugebauer
3622f1a67a
Merge pull request #2799 from justincormack/cableconnected
Connect cable on virtualbox networking
2017-12-06 10:07:14 +00:00
Rolf Neugebauer
a2cfeceda2
Merge pull request #2794 from ijc/containerd-v1.0.0
Update to containerd v1.0.0
2017-12-06 10:06:32 +00:00
David Manouchehri
c693e50f82
As requested by @ijc (https://github.com/linuxkit/linuxkit/pull/2784#discussion_r154895971).
Signed-off-by: David Manouchehri <david.manouchehri@riseup.net>
2017-12-05 19:08:43 -05:00
Justin Cormack
241e3a1bdb Connect cable on virtualbox networking
fix #2798

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-12-05 16:03:47 -06:00
Ian Campbell
3590c786bd Bump yml to pickup containerd v1.0.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-05 16:39:05 +00:00
Dave Protasowski
2d6f4c5484 Allow vpnkit executable path to be specified
Signed-off-by: Steve Hiehn <shiehn@pivotal.io>
Signed-off-by: Dave Protasowski <dprotaso@gmail.com>
2017-12-05 10:06:58 -05:00
Steve Hiehn
ec45349638 Register vpnkit publish port clean up function as a logrus.ExitHandler
Signed-off-by: Dave Protasowski <dprotaso@gmail.com>
2017-12-05 10:05:23 -05:00
Dave Protasowski
c9b4f8306a Ensure VPNKit process is properly killed when errors occur
The log.Fatal* calls will leak the vpnkit process since
defer functions are not invoked when os.Exit(int) is invoked

We register an ExitHandler with logrus - that'll be invoke when
log.Fatal* is called

Signed-off-by: Steve Hiehn <shiehn@pivotal.io>
Signed-off-by: Dave Protasowski <dprotaso@gmail.com>
2017-12-05 09:48:09 -05:00
Rolf Neugebauer
c7d9418500
Merge pull request #2795 from rn/patch
kernel: Add NVDIMM size patch to 4.14.x
2017-12-05 13:42:10 +00:00
Rolf Neugebauer
5eee692887 kernel: Add NVDIMM size patch to 4.14.x
This change hasn't made it upstream but seems to be required
for LCOW to work.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-05 10:32:33 +00:00
Ian Campbell
2561827100 Bump packages to new alpine w/ containerd v1.0.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-05 09:55:32 +00:00
Ian Campbell
206bb92bbe alpine: Bump to containerd v1.0.0
https://github.com/containerd/containerd/releases/tag/v1.0.0

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-05 09:54:47 +00:00
David Manouchehri
e9bc7353e6
As requested by @justincormack (https://github.com/linuxkit/linuxkit/pull/2784#issuecomment-349064467).
Signed-off-by: David Manouchehri <david.manouchehri@riseup.net>
2017-12-04 13:55:17 -05:00
Justin Cormack
dcff2008cd
Merge pull request #2789 from estesp/subreaper_ctrd-1.0rc0
remove subreaper config item
2017-12-04 18:49:33 +00:00
David Manouchehri
bc43735543
As requested by @ijc (https://github.com/linuxkit/linuxkit/pull/2784#pullrequestreview-80464126).
Signed-off-by: David Manouchehri <david.manouchehri@riseup.net>
2017-12-04 13:36:31 -05:00
Ian Campbell
edb6b4f7e1
Merge pull request #2792 from ijc/linuxkit-pkg-depend-images
Add dependent images to build.yml
2017-12-04 17:05:39 +00:00
Phil Estes
42014e361f
remove subreaper config item
containerd v1.0.0-rc.0 changed the subreaper config entry to the
negative given subreaper "on" is the default. However, linuxkit
does not need to change the default subreaper setting so removing
the now invalid config line.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-12-04 09:23:22 -05:00
Ian Campbell
ce639e8080 linuxkit: implement docker image dependencies for pkg build.
This allows the `linuxkit/kubernetes` "image-cache" packages to use a standard
`linuxkit pkg build` based flow rather than requiring surrounding scaffolding.

Fixes #2766. Compared with the original (actually, the second) proposal made in
issue #2766, the field is `docker-images` rather than `images` to allow for
future inclusion of e.g. `containerd-images`.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-04 14:14:45 +00:00
Ian Campbell
98d46945d1 linuxkit: Use docker image «foo» consistently
In preference to the `docker «foo»` shortcut/aliases.

Better to be more specific.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-04 12:12:41 +00:00
Ian Campbell
8eed6a4b38 linuxkit: Rename Pkg.pkgPath to Pkg.path
Previous name a bit stuttery.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-04 12:12:41 +00:00
Justin Cormack
090abf3254
Merge pull request #2790 from justincormack/vbox
Add VirtualBox support to linuxkit run
2017-12-02 11:01:51 +00:00
Justin Cormack
3251f67015 Add VirtualBox support to linuxkit run
You can use `linuxkit run vbox ...` to run using Oracle VirtualBox.
ISO or raw should be supported, and you can specify EFI.

Some more options may be useful in future.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-12-01 21:48:21 +00:00
Rolf Neugebauer
00aaf428d9
Merge pull request #2788 from rn/kern
Update kernel to 4.14.3/4.9.66/4.4.103 and remove 4.13.x
2017-12-01 17:36:14 +00:00
Ian Campbell
f0059f03f4
Merge pull request #2787 from ijc/linuxkit-pkg-more-labels
Include tool version info in package/image labels
2017-12-01 15:30:31 +00:00
Rolf Neugebauer
2c2012cdee Update YAML files to latest kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-01 15:28:10 +00:00
Rolf Neugebauer
3ed38c59f4 kernel: Update to 4.14.3/4.9.66/4.4.103
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-01 15:28:09 +00:00
Rolf Neugebauer
e7960ee0df kernel: Remove the 4.13.x kernel
4.13 has been EOLed with 4.13.16 being the last one.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-01 15:28:09 +00:00
Ian Campbell
b0fbb5e4fd
Merge pull request #2786 from ijc/containerd-v1.0.0-rc.0
Bump to containerd-v1.0.0-rc.0
2017-12-01 15:08:37 +00:00
Ian Campbell
d03e6d65e2 linuxkit pkg: include linuxkit tool's version info in labels
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-01 13:59:45 +00:00
Ian Campbell
13adecbc3e linuxkit: move version info to subpackage
Will avoid circular includes when I reference from pkglib too.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-01 13:55:43 +00:00
Ian Campbell
0dd863716d Bump yml
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-01 13:40:16 +00:00
Ian Campbell
28e22e40bb Bump packages to new alpine w/ containerd v1.0.0-rc.0
Minor updates due to renamings in containerd.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-01 13:36:16 +00:00
Ian Campbell
e5caf00020 alpine: bump to containerd v1.0.0-rc.0
https://github.com/containerd/containerd/releases/tag/v1.0.0-rc.0

Minor build tweaks needed.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-01 13:21:08 +00:00
Rolf Neugebauer
d4451e4652
Merge pull request #2778 from zx2c4/wireguard-bump
wireguard: update to 0.0.20171122 to 0.0.20171127
2017-12-01 11:07:49 +00:00
Rolf Neugebauer
9a83407986
Merge pull request #2782 from ijc/hyperkit-net-fix
hyperkit: split network option into 3
2017-12-01 11:06:19 +00:00
David Manouchehri
80b54ed341
Reuse existing local Git repository (https://github.com/linuxkit/linuxkit/pull/2784#pullrequestreview-80121346).
Signed-off-by: David Manouchehri <david.manouchehri@riseup.net>
2017-11-30 14:12:41 -05:00
David Manouchehri
b262675c91
Switch to ${HOME} (https://github.com/linuxkit/linuxkit/pull/2784#pullrequestreview-80242701).
Signed-off-by: David Manouchehri <david.manouchehri@riseup.net>
2017-11-30 13:23:04 -05:00
David Manouchehri
899d62352e
Improve vagrant up time by skipping (possibly) unneeded updates.
Signed-off-by: David Manouchehri <david.manouchehri@riseup.net>
2017-11-29 21:58:18 -05:00
David Manouchehri
bb73dab8d3
Added initial Vagrant support.
Signed-off-by: David Manouchehri <david.manouchehri@riseup.net>
2017-11-29 21:46:20 -05:00
Justin Cormack
390e8d3cb2
Merge pull request #2780 from justincormack/ena
Add support for newer AWS networking types
2017-11-29 16:15:49 +00:00
Ian Campbell
0d9de644b8 hyperkit: split network option into 3
vpnkit mode has one or two arguments (eth socket and port control socket).

If splitting into only 2 then
    vpnkit,vpnkit-state/eth.sock,vpnkit-state/port.sock
becomes
    2: vpnkit
    1: vpnkit-state/eth.sock,vpnkit-state/port.sock
rather than
    0: vpnkit
    1: vpnkit-state/eth.sock
    2: vpnkit-state/port.sock
as desired.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-29 15:12:30 +00:00
Justin Cormack
6e9b1bb09a Add support for newer AWS networking types
- ENA networking is what the very new (and bare metal) machines have
- sriov "simple" mode is Intel VF passthrough

I reflect the underlying APIs, which is bool for ENA and a string
for sriov even though there is currently only one valid sriov option...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-11-29 14:46:48 +00:00
Rolf Neugebauer
e4fcf70cdd
Merge pull request #2775 from arm64b/master-Makefile-fixing
Makefile: Fix binaries generation issue when 'docker run' failed
2017-11-29 12:00:36 +00:00
Justin Cormack
964eb5f9d7
Merge pull request #2779 from justincormack/bind-resolv-nginx
Bind mount /etc/resolv.conf into nginx container
2017-11-29 11:33:05 +00:00