Commit Graph

3995 Commits

Author SHA1 Message Date
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
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
Rolf Neugebauer
4e19cf363a Merge pull request #2119 from djs55/host-timesync-daemon
Add Docker for Mac host time sync daemon
2017-07-07 19:17:20 +01:00
Riyaz Faizullabhoy
1efc329ec4 Merge pull request #2165 from tych0/more-cve-writeups
docs: add some more CVE writeups
2017-07-07 11:06:10 -07:00
Rolf Neugebauer
dca5671fc1 Update kernel version in all YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-07 18:41:33 +01:00
Rolf Neugebauer
aa9b718d8a kernel: Update to 4.11.9/4.9.36/4.4.76
Added a new patch to the 4.11 and 4.9 kernels based on a patch
submitted to stable: https://patchwork.kernel.org/patch/9829039/

This patch fixes a off-by-one error in the VMBus code.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-07 18:41:33 +01:00
Rolf Neugebauer
6147b0a592 Update all YAML files to latest metadata package.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-07 18:30:10 +01:00
Rolf Neugebauer
f021bb8aaa pkg: In the metadata package, don't error if a dir exists
Use os.Mkdirall() instead of os.Mkdir() as it does not
error if the path already exists.

This enables specifying a default config file with the image
and then over writing it with metadata.

While at it, also update to the latest alpine base image.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-07 18:29:02 +01:00
David Scott
c9de2fb2a5 blueprints/docker-for-mac.yml: add host-timesync-daemon
This adds the helper program which resynchronises the VM's clock after
a host resume.

Signed-off-by: David Scott <dave.scott@docker.com>
2017-07-07 17:12:12 +01:00
Tycho Andersen
4bf7bfff2d docs: add some more CVE writeups
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-07-07 09:52:26 -06:00
Riyaz Faizullabhoy
aef63caa36 Merge pull request #2162 from arm64b/qemu-for-aarch64
ARM64: Remove the hardcode of virtual machine type
2017-07-07 08:40:53 -07:00
Riyaz Faizullabhoy
74851d86a5 Merge pull request #2163 from talex5/https-unikernel
Update https-unikernel example to latest API
2017-07-07 08:13:47 -07:00
Thomas Leonard
815f5599fc Update https-unikernel example to latest API
Also, stop static linking for now, as it generates a lot of warnings
with glibc.

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
2017-07-07 15:09:54 +01:00
Dennis Chen
3a9c88c0c5 ARM64: Remove the hardcode of virtual machine type
Current implementation hardcodes the virtual machine as
"q35" for x86, this patch remove this hardcode and config
the machine type according to the arch the VM is running.
Also, in order to make sure the qemu can run on arm64 platform,
we need to specify the vcpu type in the command line.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-07-07 21:54:15 +08:00
David Scott
d24d0bd559 Add pkg/host-timesync-daemon
Some hypervisors (e.g. hyperkit / xhyve) don't provide a good way to keep
the VM's clock in sync with the Host's clock. NTP will usually keep the
clocks together, but after a the host or VM is suspended and resumed the
clocks can be suddenly too far apart for NTP to work properly.

This simple daemon listens on an AF_VSOCK port and resynchronises the VM
clock from the virtualised hardware clock.

This is a Go conversion of original C code written by
Magnus Skjegstad <magnus@skjegstad.com>

Signed-off-by: David Scott <dave.scott@docker.com>
2017-07-07 11:35:36 +01:00
Rolf Neugebauer
76509e34a2 Merge pull request #2157 from MagnusS/update-dfm-blueprint
Update Docker for Mac with ACPI and metadata support
2017-07-06 18:13:13 +01:00
Riyaz Faizullabhoy
286d6ef9c0 Merge pull request #2161 from ijc/trust-issues
pkg: Update content trust handling.
2017-07-06 09:50:55 -07:00
Rolf Neugebauer
4c7ba08d67 Merge pull request #2160 from ndauten/ndd-sig-presentation
SIG: add slides link for ops+memorizer
2017-07-06 17:04:17 +01:00
Ian Campbell
aee080f621 pkg: Reduce the number of times variables containing $(shell...) are invoked.
For DIRTY and RELEASED this means simply performing a static assignment with
`:=`. For HASH it is a little more complex since it is (and we want/need it to
be) a conditional assigment. However it is only used for defining TAG, so make
that a static assignment.

This reduces the number of times the complex DIRTY shell command in particular
is evaluated.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-06 16:33:08 +01:00
Ian Campbell
4fba9d8545 pkg: Update content trust handling.
Firstly add option to disable content trust, for the use of e.g. projects which
are pushing to the linuxkitprojects org (which has no trust setup) rather than
the main linuxkit org.

Secondly, when trust _is_ enabled then enable it globally, in particular it is
now active for the `docker build` and hence containers referenced in
Dockerfiles via "FROM" will be checked.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-06 16:20:34 +01:00
Nathan Dautenhahn
79eab066fd SIG: add slides link for ops+memorizer
Signed-off-by: Nathan Dautenhahn <ndd@cis.upenn.edu>
2017-07-06 10:52:19 -04:00
Rolf Neugebauer
5d0a8fd4a8 Merge pull request #2158 from MagnusS/acpi-ex
Add ACPI hyperkit test and update platform docs
2017-07-06 14:00:09 +01:00
Magnus Skjegstad
184f643f47 tests: add hyperkit test for acpi shutdown on SIGTERM
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-06 14:07:00 +02:00
Magnus Skjegstad
037c222a70 docs: add acpi section to hyperkit docs
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-06 12:55:36 +02:00
Rolf Neugebauer
14db99c916 Merge pull request #2154 from MagnusS/add-acpi
Add pkg/acpid
2017-07-06 11:19:35 +01:00
Magnus Skjegstad
1d9f582a48 blueprints: add acpi support to dfm blueprint
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-06 12:02:08 +02:00
Magnus Skjegstad
c28704e79d blueprints: add metadata to dfm blueprint
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-06 12:01:06 +02:00
Riyaz Faizullabhoy
3f89a60736 Merge pull request #2153 from riyazdf/sig-memorizer-notes
sig-security: add meeting notes from 2017-07-05
2017-07-05 13:58:42 -07:00
Magnus Skjegstad
1e3c430a33 alpine: update versions
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-05 22:38:24 +02:00
Magnus Skjegstad
ba8be57eef pkg: add acpid
Adds a new service for running `/sbin/acpid` that comes with busybox.
The VM will shut down if the power button is pressed.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-05 22:37:46 +02:00
Magnus Skjegstad
7c063429f1 alpine: add busybox-initscripts
Add busybox-initscripts as it contains /etc/acpi needed to run
/sbin/acpid.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-05 20:48:41 +02:00
Riyaz Faizullabhoy
aaa39763b4 sig-security: add meeting notes from 2017-07-05
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-07-05 11:44:22 -07:00
Rolf Neugebauer
bfb82fb8aa Merge pull request #2144 from kunalkushwaha/make-proxy-setting
docker run works behind proxy too.
2017-07-04 13:46:20 +01:00
Kunal Kushwaha
d9b5c5a116 docker run works behind proxy too.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-07-04 09:25:14 +09:00