Commit Graph

4177 Commits

Author SHA1 Message Date
Liqdfire
457f9a61c6 fix BASE in makefile to match Dockerfile
Signed-off-by: Liqdfire <liqdfire@gmail.com>
2017-07-14 14:00:43 -04:00
Justin Cormack
b0800cba59 update getty hash
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 18:38:36 +01:00
Justin Cormack
98ed378dbd Add a securetty file
Do not copy host securetty file - this one should be comprehensive
or bind mount host one in yourself.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 18:34:52 +01:00
Riyaz Faizullabhoy
469ba103db Merge pull request #2209 from ijc/expurgate-set--x
pkg/mount: Remove set -x
2017-07-14 09:58:36 -07:00
Riyaz Faizullabhoy
66e328e38d Merge pull request #2211 from justincormack/runc-static-pie
Make runc a static pie executable
2017-07-14 09:56:56 -07:00
Justin Cormack
36df256177 Merge pull request #2202 from rn/lcow2
Add experimental support for LCOW
2017-07-14 16:58:01 +01:00
Justin Cormack
497122126f update runc hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 15:54:11 +01:00
Justin Cormack
53d5ea42c4 Build runc as static pie
This was waiting on the runc update which added ability to add extra flags.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 15:38:32 +01:00
Ian Campbell
0fbea002dc Update yml
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 15:21:09 +01:00
Ian Campbell
77ec9bced3 pkg/mount: Remove set -x
Noisy.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 15:21:01 +01:00
Justin Cormack
fe8084d5d1 Merge pull request #2204 from ijc/service-sod-cleanup
Service start of day cleanup
2017-07-14 15:19:37 +01:00
Justin Cormack
33a220ac1b Merge pull request #2208 from justincormack/config-test-modprobe
Allow config test modprobe to fail
2017-07-14 15:19:18 +01:00
Rolf Neugebauer
5dca5db06b blueprints: Add blueprint for LCOW
See the README for instructions on how to use

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-14 15:07:35 +01:00
Rolf Neugebauer
cbc8d4a21c pkg: Add LCOW init package
This package build the init filesystem for LCOW (Linux Containers
on Windows) based on the instructions from:
https://github.com/Microsoft/opengcs.git

We also pull in a udhcpd config script from a specific version of
busybox which was the tip of master at the time this was added.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-14 15:02:42 +01:00
Rolf Neugebauer
b79f677418 build: Upda moby tool to the latest
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-14 15:02:42 +01:00
Ian Campbell
59e71c1821 alpine: Record image has in versions file
Otherwise the only record is if the pusher happens to remember to put it in the
commit message (tollerable) or the github PR (not great).

Also add the same show-tag target as `pkg/package.mk` supports, although with a
very different implementation.

The actual hash is unchanged from the previous commit.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 15:02:42 +01:00
Ian Campbell
92e180c985 alpine: stash the original /etc/apk/repositories for downstream use
If a user of linuxkit/alpine wants to produce an image with apk in it then it
is useful for them to have the original upstream repository list.

The new hash is linuxkit/alpine:3744607156e6b67e3e7d083b15be9e7722215e73

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 15:02:42 +01:00
Dennis Chen
3ef5f27e49 ARM64: specify external firware binary for containerized qemu
Current implementation uses a fixed firmware(bios) binary
installed by the build process of the qemu container image,
which will prevent us from providing an external firmware binary
outside the container. This patch removes this limitation, thus we
can assign a firware binary image file with "-fw" option.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-07-14 15:02:42 +01:00
Justin Cormack
a6b1718490 Merge pull request #2205 from ijc/alpine-repo-and-hash
Small alpine mirror improvements
2017-07-14 14:24:55 +01:00
Justin Cormack
9d423204f7 Merge pull request #2203 from arm64b/firmware-file-in-container
ARM64: specify external firware binary for containerized qemu
2017-07-14 14:17:02 +01:00
Justin Cormack
fa8f5aa7e6 update hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 14:06:05 +01:00
Justin Cormack
88c63ad389 Do not fail if some modules not found
May be built in to kernel.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 14:04:32 +01:00
Ian Campbell
074431eebe Update yml to linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 13:53:51 +01:00
Justin Cormack
ecaa7f9c68 Remove the -x from the rungetty script
Its annoyingly verbose!

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 13:53:45 +01:00
Ian Campbell
538c8b5a7b containerd: Add a service command to cleanup stale containers on boot
This may occur if /var/lib/container happens to be on persistent storage.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 13:50:46 +01:00
Justin Cormack
4eb0f00db6 Merge pull request #2191 from justincormack/runc-only
Move onboot startup script to runc package
2017-07-14 13:36:36 +01:00
Ian Campbell
28905c57cc alpine: Record image has in versions file
Otherwise the only record is if the pusher happens to remember to put it in the
commit message (tollerable) or the github PR (not great).

Also add the same show-tag target as `pkg/package.mk` supports, although with a
very different implementation.

The actual hash is unchanged from the previous commit.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 12:41:11 +01:00
Ian Campbell
00a2f2ac8c alpine: stash the original /etc/apk/repositories for downstream use
If a user of linuxkit/alpine wants to produce an image with apk in it then it
is useful for them to have the original upstream repository list.

The new hash is linuxkit/alpine:3744607156e6b67e3e7d083b15be9e7722215e73

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 12:37:38 +01:00
Justin Cormack
de415f9424 Remove containerd from tests where not required
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 11:23:27 +01:00
Justin Cormack
f8a0b332f2 Update hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 11:08:50 +01:00
Justin Cormack
28b4245b12 Move onboot startup script to runc package
As this does not use containerd at all, this means you can run very
minimal setups with just `runc` if you use no services, for example
most of our tests do not actually use services, or if you have other
similar very minimal use cases.

Move ulimit setup to `init` which makes more sense.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 11:04:35 +01:00
Dennis Chen
3b1dfb69c7 ARM64: specify external firware binary for containerized qemu
Current implementation uses a fixed firmware(bios) binary
installed by the build process of the qemu container image,
which will prevent us from providing an external firmware binary
outside the container. This patch removes this limitation, thus we
can assign a firware binary image file with "-fw" option.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-07-14 09:10:42 +00:00
Riyaz Faizullabhoy
d551eed755 Merge pull request #2200 from riyazdf/sig-security-agenda-fixes
fixup sig-security agenda
2017-07-13 09:31:40 -07:00
Justin Cormack
944793312a Merge pull request #2197 from ijc/qemu-envvar-overrides
qemu: allow kvm and containerized options to be overridden by the env…
2017-07-13 16:25:51 +01:00
Riyaz Faizullabhoy
bd3edec88b fixup sig-security agenda
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-07-13 08:06:34 -07:00
Justin Cormack
22be0a10bf Merge pull request #2159 from ijc/update-containerd
Update containerd
2017-07-13 15:47:15 +01:00
Ian Campbell
cc8bd94960 qemu: allow kvm and containerized options to be overridden by the environment
This is useful in the case where Moby is shelling out to LinuxKit for certain
image types (currently raw and qcow2). Currently to experiment with different
options (e.g. when comparing performance to CI) you have to edit either the
moby or linuxkit tool to change the options used.

The environment variables take precedence over any explict command line options
given.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 15:23:14 +01:00
Ian Campbell
f67050b5ed Bump moby tool to 4db06aa173
$ git log --oneline 51b4e201544f..4db06aa1732b
4db06aa Merge pull request #111 from ijc/master
f20828b Update LinuxKit components used for build
75cc04a Merge pull request #109 from justincormack/contributing
b4804b6 Add Contributing doc

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 14:49:43 +01:00
Justin Cormack
f7fc5598b6 Disable qemu in container test
Failing for some time; see https://github.com/linuxkit/linuxkit/issues/2020

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-13 13:43:32 +01:00
Ian Campbell
89e7627576 Split linuxkit.build.outputs into distinct tests
This test was building all the supported output formats and so was taking
orders of magnitude longer than every other test. It was also obscuring which
output formats were slow and/or broken.

The vhd test remains skipped.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 13:42:24 +01:00
Rolf Neugebauer
425f37890d Merge pull request #2194 from dave-tucker/fix-qemu-bug
linuxkit: Fix qemu run behaviour when file does not exist
2017-07-13 13:29:14 +01:00
Dave Tucker
94f2d2cd9a linuxkit: Fix qemu run behaviour when file does not exist
This commit fixes an issue reported on Slack where `linuxkit run` will
assume that a file that is neither a kernel or iso must be a disk image
without first checking that it exists. This would result in `qemu-img`
attempting to create a disk with 0 size due to the default behaviour of
creating disk images that do not exist.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-07-13 11:46:22 +01:00
Justin Cormack
b3883ad5df Merge pull request #2193 from riyazdf/security-sig-agenda
sig-security: add preliminary agenda for 2017-07-19
2017-07-13 11:34:36 +01:00
Ian Campbell
3891a179e5 tests: Bump containerd to linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4
All tests are now using the same init+runc+containerd as the top-level
linuxkit.yml

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 10:59:43 +01:00
Ian Campbell
fa1ac99dfb Update yml's to linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4
Only those which used the same value as linuxkit.yml are updated.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 10:45:45 +01:00
Ian Campbell
902e6182b0 Temporarily use https://github.com/containerd/containerd/pull/1141
We expect this (or something very similar) to be merged soon, it fixes #2131 so
moving ahead now.

The new alpine mirror is linuxkit/alpine:6832775a7e861ee2d7842e157688ece52d007142

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 10:42:55 +01:00
Ian Campbell
c5634c4650 Define CONTAINERD_REPO alongside CONTAINERD_COMMIT in tools/alpine
This will make it simpler to temporarily in PRs which are not yet merged (but
are expected to be soon).

Tools alpine is not rebuilt here since we are going to do just that in the next
commit.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 10:38:27 +01:00
Ian Campbell
0c6af4b3be Add a helper script for bulk updating component sha's
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-13 10:37:24 +01:00
Ian Campbell
a82ec03120 Update to moby tool 51b4e20154
$ git log --no-merges --oneline d8cc1b3f08df..51b4e201544f
6c6499b Update docker/docker vendor to 6978a6e25a2e6063f280ec842bd0f3eae99426e1
3ee4fdc Error if there are duplicate service names
3c5fad4 Remove dependency on docker/docker/cli
5e75f8c Only run `go test` and `go vet` if not cross building (i.e. ${GOOS} unset)
48f1dd0 Build for Darwin and Windows in CI
c3edfec revendor runc + runtime-spec to match containerd 8e1a04ff9ee3
a73c3d3 Add partial user namespace support
0acaaa7 Assign each container a uid and gid it can use
c5070df Add docs for ambient capabilities
66b4aed Add support for ambient capabilities
c2e460f check that caps are valid
b605e61 Adding dynamic-vhd Output Format
e7ebabd Split out into a small stub command line and a library
4401e7d Rename the docker run function
c5cccad Return errors from build internal function
618dc42 Allow creation of empty files
ad3de8f Add support for rlimits
13da5e0 Use hyperkit to make raw disks

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-13 10:37:24 +01:00
Ian Campbell
a2d3be0e6f Update runc and containerd
pull in newer containerd v1.0.0-alpha0 via updated alpine base, update runc to
429a5387123625040bacfbb60d96b1cbd02293ab which is vendored by that version of
containerd (and also update alpine base for runc)

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-13 10:37:15 +01:00