Commit Graph

4319 Commits

Author SHA1 Message Date
Rolf Neugebauer
57659aa5dd kernel: Update to 4.9.40/4.4.79
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-28 19:25:55 +01:00
Rolf Neugebauer
b7f33d7b65 Merge pull request #2316 from davefreitag/nfs
Add NFS Debug Modules
2017-07-28 19:23:48 +01:00
Dave Freitag
9152d065b6 Add NFS Debug Modules
- Adding NFS debug modules to kernel_config.debug
- Also updating some dead links in the kernels.md doc file

Signed-off-by: Dave Freitag <dcfreita@us.ibm.com>
2017-07-28 10:48:10 -05:00
Justin Cormack
25ddb186a4 Merge pull request #2313 from arm64b/dirty-make-issue
package.mk: Adjust the targe sequence to avoid early abort
2017-07-28 14:31:49 +01:00
Dennis Chen
d9e5e41df3 package.mk: Adjust the targe sequence to avoid early abort
Current package.mk will operate on the first dependence object
'check-dirty', which will result the make process abort earlier
with below message:
pkg/package.mk:60: *** Your repository is not clean. Will not push package image.  Stop.

This is not expected behavior since we have no chance to build
a docker image locally in case of the user has no intention to
push that image.

This patch adjust the dependece order for the default target, thus
we can build the docker image locally but can't push that image
since we're in a dirty git repository.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-07-28 11:05:26 +00:00
Justin Cormack
f1bd7c2e4d Merge pull request #2312 from mbentley/fix-compose-docker
Fixed commands and resolv.conf in docker example
2017-07-28 09:51:17 +01:00
Matt Bentley
e7cb367674
Fixed commands and resolv.conf in docker and compose project examples
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2017-07-27 16:39:39 -04:00
Justin Cormack
280ee41e34 Merge pull request #2310 from justincormack/binfmt-basedir
Add mountpoint to binfmt image
2017-07-27 16:34:50 +01:00
Justin Cormack
2c58fbc01a Merge pull request #2308 from ijc/avoid-orig-extension
test: rename *.orig to *.in
2017-07-27 15:17:27 +01:00
Justin Cormack
7211045ba6 update binfmt hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-27 15:11:14 +01:00
Justin Cormack
9a823cf2e2 Add mountpoint to binfmt image
As this is read only it should be explicitly created.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-27 15:05:48 +01:00
Avi Deitcher
8f10f69fd3 Merge pull request #2233 from dave-tucker/ns-detect
getty: Detect if you are in a namespace
2017-07-27 16:50:02 +03:00
Ian Campbell
3cc80c02e7 test: rename *.orig to *.in
*.orig is also dropped by failed patch application and so is subject to
automatically being cleaned up.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 13:47:53 +01:00
Avi Deitcher
d4f5878669 Update hashes in examples 2017-07-27 15:45:19 +03:00
Avi Deitcher
543e61c643 Fix typo
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-27 15:38:20 +03:00
Justin Cormack
16674a1557 Merge pull request #2306 from ijc/containerd-v1.0.0-alpha2
Containerd v1.0.0 alpha2
2017-07-27 13:30:24 +01:00
Avi Deitcher
5cda493a21 Update hashes for getty
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-27 15:01:29 +03:00
Dave Tucker
f41c976406 getty: Detect if you are in a namespace
This is an attempt at fixing #2213

If `INITGETTY` has been set then we are not in a namespace.

Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-27 14:55:28 +03:00
Ian Campbell
886870c935 alpine: Use C locale to sort the versions file.
This should reduce instability due to different people's environment. This
undoes the reordering done by "alpine: Update to containerd v1.0.0-alpha2",
leaving just the hash update (as expected).

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 12:14:36 +01:00
Rolf Neugebauer
4327329265 Merge pull request #2304 from rn/opengcs-up
Update LCOW to latest opengcs version
2017-07-27 12:07:42 +01:00
Ian Campbell
88ab788749 tests: reenable linuxkit.packages.containerd
The newest tests actually run containerd and therefore have some additional
requirements:
- containerd + shim + runc binaries are needed. We bind these in from the host.
  The test code should, by design, be from matching containerd source, assuming
  we remember to update test/pkg/container/Dockerfile when we bump
  CONTAINERD_COMMIT.  5217b9973b added a reminder
  to do so.
- the tests need networking (to pull images). So add dhcp to onboot and bind
  /etc/resolv.conf into the test container.
- running containers requires a writeable cgroup mount.
- containerd wants /etc/localtime, so install the UTC one (as we do in
  pkg/containerd).

The test image already has `net: host` and `capabilities: all`.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 12:06:59 +01:00
Ian Campbell
017d3304fc Update yml after containerd bump
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:45:56 +01:00
Ian Campbell
8eb6709a3c containerd: Bump to new alpine (with v1.0.0-alpha2)
The logrus import path has changed, so adjust. Also there is a minor API change
to the containerd.IOCreation() function spec, it now takes a string id which we
can ignore.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:07:03 +01:00
Ian Campbell
c8164c0a6e alpine: Update to containerd v1.0.0-alpha2
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:07:03 +01:00
Rolf Neugebauer
b7e88fbde4 blueprints: Update LCOW init to latest opengcs version
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-27 11:02:35 +01:00
Rolf Neugebauer
a18f4403d0 pkg/init-lcow: Update opengcs to latest
While at it, might as well update linuxkit/alpine to the latest.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-27 10:47:19 +01:00
Justin Cormack
bafeac62ec Merge pull request #2301 from rn/base-ovmf
Various OVMF related fixes
2017-07-27 10:25:24 +01:00
Justin Cormack
79d3546dfd Merge pull request #2298 from ijc/tools-and-test-iidfile
tools & test use package.mk and build --iidfile
2017-07-27 10:24:46 +01:00
Justin Cormack
941e31a519 Merge pull request #2278 from deitch/tpm-tools
tpm tools
2017-07-26 22:01:51 +01:00
Rolf Neugebauer
896c3574ab cmd: Change logic for using EFI FW when qemu is run in a container
By default we want qemu to use the EFI firmware image in the qemu
container. However the logic in the code would always bind mount
the FW image into the container.

This commit changes the logic to only bind mount the FW image if
it was specified on the commandline.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-26 18:14:28 +01:00
Rolf Neugebauer
4b25e00c7d cmd: Update qmeu container image hash
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-26 18:14:28 +01:00
Rolf Neugebauer
930c9c21df tools/qemu: Install ovmf for x86
The previous commit moved ovmf to the packages instead
of stashing it on the filesystem. This requires the
package to be installed here.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-26 18:14:28 +01:00
Rolf Neugebauer
bf5a461ce5 tools/alpine: Add OVMF to the mirror and not the image
We add the 'ovmf' to the mirror instead of installing
it in the rootfs. This way we record the version we are
using.

We already pull a few images (go, tini) from community
so may as well pull ovmf directly via 'packages.x86_64'.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-26 18:14:28 +01:00
Justin Cormack
4ab25657d1 Merge pull request #2299 from justincormack/runc-go-startup
Switch runc and containerd startup to be entirely Go
2017-07-26 17:59:37 +01:00
Ian Campbell
5217b9973b alpine: Reminder to bump the containerd test when bumping containerd
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 17:27:11 +01:00
Justin Cormack
9e38a97571 Merge pull request #2300 from ijc/kubernetes
kubernetes: provide /etc/resolv.conf to kube and docker containers.
2017-07-26 17:26:45 +01:00
Ian Campbell
3f8e733d9a Skip linuxkit.packages.containerd test for now.
It requires reworking to ensure `containerd` is in the path and to provide
network access. See https://github.com/linuxkit/linuxkit/pull/2298#issuecomment-318106583

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 17:24:08 +01:00
Justin Cormack
b853e05d9c Update init, runc, containerd hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-26 16:51:11 +01:00
Avi Deitcher
ffb33e9d64 tpm.yml example update hash and add example test case
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-26 18:36:14 +03:00
Justin Cormack
cb2ca4ef66 Switch runc and containerd startup to be entirely Go
At present they use a small shared function called "prepare"
that does the read-write remounts, that I will switch to doing overlay
mounts soon.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-26 16:32:09 +01:00
Ian Campbell
d4479cbe10 kubernetes: update hashes
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 16:21:33 +01:00
Ian Campbell
dda7d30182 kubernetes: provide /etc/resolv.conf to kube and docker containers.
After #2289 we need to bind /etc/resolv.conf into the docker and kubelet
containers on both node and master.

Also since #2289 the metadata container requires /etc/resolv.conf to be
populated on the host, which means running DHCP earlier in oneshot onboot mode,
do so.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 16:19:40 +01:00
Justin Cormack
5194bf13d1 Merge pull request #2296 from justincormack/service-does-more
Make service start up containerd and services
2017-07-26 15:34:03 +01:00
Ian Campbell
df19ad752a tools/mkimage-iso-*: Transition to alpine base + package.mk
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 14:47:42 +01:00
Ian Campbell
9f7917e543 tools: Update consumers of linuxkit/guestfs to package.mk build
Also update the base image to the latest.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 14:47:42 +01:00
Ian Campbell
ac3103236e toos/guestfs: Enable content trust globally
This makes the need to pull $(BASE) redundant.

Rebuild resulted in linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 14:47:42 +01:00
Ian Campbell
b472f79dbf tools/guestfs: Use build --iidfile
Modelled after tools/alpine's build.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 14:47:42 +01:00
Ian Campbell
d823d7fab7 tests: Update hashes for test/pkg/*
with cwd of test this was done with:
for i in pkg/* ; do make --no-print-directory -C $i show-tag; done | ( IFS=: ; while read image hash ; do ../scripts/update-component-sha.sh --image $image $hash ; done )

Note that `linuxkit/test-virtsock` (built by `test/pkg/virtsock`) does not
appear to be referenced anywhere.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 14:47:15 +01:00
Ian Campbell
acbe38d8a1 tests/pkg: Update remaining builds to pkg/package.mk
Also update the base tools/alpine to latest.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 14:46:41 +01:00
Ian Campbell
37de9c8c1d test-ns: Update DEPS
Makefile and Dockerfile are implicit from pacakge.mk.

Need to list the other files consumed by the Dockerfile though.

template.yml is only for manual testing and so is not a dependency of the
standard build.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 14:46:25 +01:00