Commit Graph

4177 Commits

Author SHA1 Message Date
Ian Campbell
aa3db640af Update alpine base to containerd v1.0.0-alpha0
New hash is linuxkit/alpine:8bb8664eec04e02a8a131c53aa7d5d94119270ef

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-13 10:32:00 +01:00
Riyaz Faizullabhoy
5aa5faf8f1 sig-security: add preliminary agenda for 2017-07-19
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-07-12 15:29:05 -07:00
Rolf Neugebauer
9e5179f11c Merge pull request #2192 from rn/lcow
Kernel config update
2017-07-12 19:45:27 +01:00
Rolf Neugebauer
98615f43e7 kernel: Add 4.11 kernel config options for LCOW
This is a semi-educated guess of which kernel config options
may be needed to run LCOW based on the config file posted here:
2e5c2fac44/kernelconfig/4.11/kconfig_for_4_11

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-12 18:16:42 +01:00
Rolf Neugebauer
ed18d81191 kernel: Enable more hardware drivers and KVM
- Enables module for some common 10/40G NICs
  from Broadcom, Intel, and Mellanox
- Enable KVM and related modules

These are targeted to support more bare metal
configuration with LinuxKit.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-12 18:16:42 +01:00
Rolf Neugebauer
11e06d3d63 kernel: Update 4.11.x patches
Incorporate the update for the Hyper-V socket patches from
https://github.com/dcui/linux/commits/decui/hv_sock/v4.11/20170511-debug-0628-with-signed-off-by-of-dexuan-fixed
as well as the additional pLCOW requires patches from
2e5c2fac44

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-12 18:16:41 +01:00
Rolf Neugebauer
c1e48c37ac Merge pull request #2190 from arm64b/kernel-Makefile-config
ARM64: Add kernel config file for aarch64
2017-07-12 18:12:51 +01:00
Dennis Chen
fb8eb41623 ARM64: Add kernel config file for aarch64
Add the kernel configuration file of arm64.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-07-12 09:10:17 +00:00
Justin Cormack
d4e5773a2b Merge pull request #2189 from justincormack/no-shellcheck
Remove shellcheck from base
2017-07-11 23:19:57 +01:00
Justin Cormack
f98a56fc2c Merge pull request #2179 from deitch/read-only-securetty
Use existing securetty
2017-07-11 23:19:43 +01:00
Justin Cormack
30128d894e Remove shellcheck from base
We should use this from a container at top level instead; it makes it
much harder to port to other architectures if we have to have this as
it is written in Haskell making a multi arch build much harder.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-11 22:15:27 +01:00
Justin Cormack
4b3fc038b7 Merge pull request #2188 from justincormack/never-metadata-i-didnt-like
Add labels for repo and commit to packages
2017-07-11 18:22:15 +01:00
Justin Cormack
9b4bce1e40 Add forcetag to package build
Use this if you really need to rebuild a package, eg if you change `pakcage.mk`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-11 16:35:58 +01:00
Justin Cormack
5e7cb2b23d Merge pull request #2185 from arm64b/kernel-dockerfile-refactor
ARM64: Adapt the kernel Dockerfile to multiarch support
2017-07-11 15:24:54 +01:00
Justin Cormack
cc0e85abfc Merge pull request #2186 from justincormack/vndr-up
Re-run vendoring
2017-07-11 14:44:20 +01:00
Justin Cormack
ed38adbc90 Add labels for repo and commit to packages
- use image spec metadata https://github.com/opencontainers/image-spec/blob/master/annotations.md
- omit commit if dirty

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-11 14:33:59 +01:00
Dennis Chen
e0a8a1d4df ARM64: Adapt the kernel Dockerfile to multiarch support
The original kernel Dockerfile hardcodes the amd64 as the
only arch supported, this patch removes this kind of hardcode
and make the Dockerfile is ready to support both amd64 and
arm64 by using the runtime arch type.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-07-11 12:39:27 +00:00
Justin Cormack
107c014a9d Re-run vendoring
Latest `vndr` has changed its algorithm a bit. It also pointed out that we were missing
some things.

Move the `vendor` directory up to the `linuxkit` command, else it gets confused by packages
that have Go code in.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-11 13:12:00 +01:00
Avi Deitcher
5d18cba75f Use existing securetty
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-11 14:43:26 +03:00
Rolf Neugebauer
9ee7b23d1e Merge pull request #2166 from sbourlon/vcenter-add-datacenter-param
Backend vCenter: add the datacenter parameter
2017-07-11 00:21:37 +01:00
Stefan Bourlon
846e814a7f Backend vCenter: Remove network param for push cmd
The network parameter is not used in the command
"linuxkit push vcenter ..."

Signed-off-by: Stefan Bourlon <stefan.bourlon@ca.com>
2017-07-10 14:03:55 -07:00
Riyaz Faizullabhoy
c17e9d24b9 Merge pull request #2184 from riyazdf/sig-video-memorizer
sig-security: add video link
2017-07-10 13:36:21 -07:00
Riyaz Faizullabhoy
550dd5ea9a sig-security: add video link
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-07-10 12:07:47 -07:00
Riyaz Faizullabhoy
f5ab0aeb2b Merge pull request #2182 from MagnusS/move-logs-to-disk
dfm: Move logs from memory to disk
2017-07-10 11:18:11 -07:00
Riyaz Faizullabhoy
0b46edb26c Merge pull request #2181 from justincormack/no-rngd-on-mac
Remove rngd from Mac blueprint
2017-07-10 10:49:10 -07:00
Riyaz Faizullabhoy
b7a782e3cd Merge pull request #2183 from avsm/week-27-dev-report
reports: week 27 development report
2017-07-10 10:47:48 -07:00
Anil Madhavapeddy
d5bc3d4b98 reports: week 27 development report
Signed-off-by: Anil Madhavapeddy <anil@docker.com>
2017-07-10 16:42:04 +01:00
Magnus Skjegstad
9daca681a1 blueprints, dfm: move logs, mount disk in /var/lib
This mounts the disk image in /var/lib (instead of /var/lib/docker) and
moves the logs to /var/lib/log. This is to have the logs on disk until
we have a better solution in place.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-10 16:03:08 +01:00
Justin Cormack
ccbdde0f5c Remove rngd from Mac blueprint
Hyperkit sets up PV entropy driver, so we do not need `rngd`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-10 15:46:45 +01:00
Magnus Skjegstad
20eaf62df1 blueprints: only bind mount /port once in dfm blueprint
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-10 15:22:47 +01:00
Justin Cormack
4902e6f862 Merge pull request #2177 from justincormack/ttyS0
Move ttyS0 after tty0 as it is more common
2017-07-09 21:00:49 +01:00
Justin Cormack
a5b9464a4e Move ttyS0 after tty0 as it is more common
This means more users will see console output at boot time.

Remove page poison from example CLIs, we should document this
elsewhere and put in blueprints.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-09 19:39:41 +01:00
Justin Cormack
09836c87e5 Merge pull request #2176 from justincormack/cleaner
Add raw files to make clean
2017-07-09 19:33:43 +01:00
Justin Cormack
73b0e53b70 Merge pull request #2178 from justincormack/quotes
Consistently don't use quotes around image names
2017-07-09 19:33:15 +01:00
Justin Cormack
ae0f6cbd71 Merge pull request #2175 from hansbogert/patch-1
Fix formatting error in README.md
2017-07-09 17:49:48 +01:00
Justin Cormack
298f4aab32 Consistently don't use quotes around image names
These are not needed, but we are inconsistent. Been waiting for a
quiet moment to fix this since I noticed while doing a presentation...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-09 17:47:30 +01:00
Justin Cormack
775f43daf0 Add raw files to make clean
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-09 17:31:44 +01:00
Hans van den Bogert
ef04a41a6c Fix formatting error in README.md
Signed-off-by: hansbogert <hansbogert@gmail.com>
2017-07-09 17:40:36 +02:00
Justin Cormack
6483956f58 Merge pull request #2172 from rn/netns
Add some network namespace stress tests
2017-07-08 16:22:03 +01:00
Rolf Neugebauer
be5fbb0481 tests: Add stress tests for network namespaces
These test specific combinations of TCP/UDP/IPv4/IPv6/veth/loopback
for all the kernels.

Tests take quite a while to run so there are two new labels:
'kernel' and 'kernel-extra'. 'kernel' runs the more important
tests for the two kernels we care most about. 'kernel-extra'
are additional tests for completeness.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-08 14:56:44 +01:00
Rolf Neugebauer
9fad2e8b31 tests: Add a package for network namespace stress tests
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-08 14:52:49 +01:00
Rolf Neugebauer
03b78d5153 tools: Add a few more packages to the Alpine base image
- iproute2 provides a more complete suite of 'ip' utilities than
  the busybox implementation. Useful, for debugging.
- iperf3 for network testing
- tcpdump for network debugging
- expect is used in some tests. Adding it to the base image should
  make it easier to create a LinuxKit image to self-host CI.

The new version of the base package is:
linuxkit/alpine:3d57ded3edd54e616210cf0c17e3bc15eed9d03a

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-08 13:48:30 +01:00
Justin Cormack
8ca19a84d5 Merge pull request #2169 from rn/auth
Update AUTHORS
2017-07-08 10:50:38 +01:00
Rolf Neugebauer
6279dc16bd Update AUTHORS
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-08 00:41:24 +01:00
Rolf Neugebauer
f41fdaf1d6 Merge pull request #2168 from estesp/docs-format-ext-disk
Fix markdown format mistake and text re: disk path
2017-07-08 00:24:52 +01:00
Stefan Bourlon
ffef020a09 Backend vCenter: add the datacenter parameter
Signed-off-by: Stefan Bourlon <stefan.bourlon@ca.com>
2017-07-07 14:32:14 -07:00
Stefan Bourlon
ea5114dc93 Backend vCenter: Upload ISO only with linuxkit push
Signed-off-by: Stefan Bourlon <stefan.bourlon@ca.com>
2017-07-07 14:26:58 -07:00
Phil Estes
bbc93151c4
Fix markdown format mistake and text re: disk path
Formatting was incorrect due to mismatched mark; also, it appears that
qemu also uses the state directory now for the created disk image. Also
used the same italicized style for param reference in text instead of
some bracketed and some italicized.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-07-07 15:51:28 -04:00
Rolf Neugebauer
561c204de6 Merge pull request #2167 from rn/kern-up
Update kernel to 4.11.9/4.9.36/4.4.76
2017-07-07 19:48:24 +01:00
Rolf Neugebauer
c3bc803445 Merge pull request #2164 from rn/meta
Allow metadata package to over write existing config files
2017-07-07 19:48:09 +01:00