Commit Graph

1940 Commits

Author SHA1 Message Date
Justin Cormack
40a3b5578a Always have database at /Database
Use a bind mount for OSX and Windows for 9p filesystem.

This makes it easier to use a different database source,
and to share database into system containers.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 14:34:29 +00:00
Riyaz Faizullabhoy
14aeaf0fb5 Merge pull request #1054 from justincormack/ca-cert
Update ca-certificates to 20161130
2017-01-19 09:51:46 +00:00
Justin Cormack
7082a3161e Update ca-certificates to 20161130
In most places we use the Alpine one, which is already here, but
make sure this is updated, as we may use it more (yes, we should be
consistent).

Change the hash to just use the ca-cert hash, not the apt hash.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 09:15:54 +00:00
Justin Cormack
5f29f59618 Merge pull request #1039 from RobbKistler/hyperkit-test
Improve hyperkit/osx testing
2017-01-18 18:18:36 +00:00
Robb Kistler
29e3d74c2a Improve hyperkit/osx testing
Address #954:
- Pull hyperkit and vpnkit binaries from CI
- Use vpnkit instead of vmnet
- Add hyperkit-test test target

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-01-18 09:56:24 -08:00
Justin Cormack
1f860228d7 Merge pull request #1047 from riyazdf/fs-protected-links
Add fs link protection sysctls
2017-01-18 17:28:17 +00:00
Justin Cormack
f4774d317d Merge pull request #1052 from riyazdf/oom-adj-system-containers
Adjust OOM scores for system containers
2017-01-18 17:27:37 +00:00
Justin Cormack
eb21eab61f Merge pull request #1049 from justincormack/docker-1.13.0
Update Docker to 1.13.0
2017-01-18 17:27:13 +00:00
Riyaz Faizullabhoy
a2b3d84668 Adjust OOM scores for system containers
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-18 16:47:53 +00:00
Justin Cormack
31e898f728 Merge pull request #1048 from justincormack/aufs4.4-clean
Remove aufs4.4 reference from make media
2017-01-18 16:35:53 +00:00
Justin Cormack
e579b09a5c Remove aufs4.4 reference from make media
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 16:28:43 +00:00
Justin Cormack
36df13e1ef Update Docker to 1.13.0
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 16:14:17 +00:00
Riyaz Faizullabhoy
b919d6483b Add fs link protection sysctls
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-18 15:20:40 +00:00
Justin Cormack
fdbc4ab609 Merge pull request #1044 from justincormack/no-aufs4.4
Remove aufs 4.4 support
2017-01-18 12:12:48 +00:00
Justin Cormack
99648a82d1 Remove aufs 4.4 support
This only shipped for one rc and we are not going to ship it any more,
and CI is disabled.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 11:44:31 +00:00
Justin Cormack
8498a98153 Merge pull request #1038 from rneugeba/kern-up
kernel: add virtion_net csum fix and update patches to 4.9.4
2017-01-18 09:43:04 +00:00
Rolf Neugebauer
d9dd60668d kernel: add virtion_net csum fix and update patches to 4.9.4
Cherry-pick virtio_net csum fix and update patches based on:
https://github.com/rneugeba/linux-stable/tree/v4.9.4-moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-17 21:25:58 +00:00
Justin Cormack
d2b99ffdd6 Merge pull request #1036 from justincormack/buildmode-pie
Use buildmode pie for Go code
2017-01-17 16:21:30 +00:00
Justin Cormack
74d3bce70e Use buildmode pie for Go code
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 16:03:50 +00:00
Justin Cormack
ce2d21d79e Merge pull request #1037 from justincormack/qemu-alpine
Use Alpine for qemu-static
2017-01-17 16:01:26 +00:00
Justin Cormack
7d071f52b1 Use Alpine for qemu-static
Static qemu-user is now available in Alpine edge. Includes the
patch for Golang crashing due to non standard signal usage.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 15:37:31 +00:00
Justin Cormack
a16ec91ca3 Merge pull request #1035 from justincormack/no-aufs4.4
Do not build aufs4.4 branch
2017-01-17 15:21:33 +00:00
Justin Cormack
a3991d2885 Merge pull request #1033 from justincormack/untar-hashes
Do not use tar to make hashes
2017-01-17 15:21:23 +00:00
Justin Cormack
c7ee4ea5e7 Merge pull request #1034 from justincormack/test-container
Build test container from a Docker container
2017-01-17 14:57:03 +00:00
Justin Cormack
8f03ea4753 Do not build aufs4.4 branch
Not being used and we will delete code for this soon, after 1.13 ships.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 14:31:52 +00:00
Justin Cormack
0bd7f620ff Do not use tar to make hashes
As it includes timestanps in the tarball it does not make a stable
hash; use contents of the files instead.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 14:28:23 +00:00
Justin Cormack
975b598089 Merge pull request #1032 from justincormack/sha-hash
Use hash for sha image, otherwise requires network access for build
2017-01-17 14:25:52 +00:00
Justin Cormack
640afbbe33 Build test container from a Docker container
Corresponds to #1030 but for test container

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 14:24:57 +00:00
Justin Cormack
0e6d7d150f Use hash for sha image, otherwise requires network access for build
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 13:36:09 +00:00
Justin Cormack
7f2ebae2c3 Merge pull request #1030 from justincormack/build-containers
Build containerd containers from Docker containers
2017-01-17 13:24:58 +00:00
Justin Cormack
e2b4bacfd6 Build containerd containers from Docker containers
Simplifies the build process, and makes testing easier as there is a
Docker container you can run to test things.

Replaces #994

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 12:29:55 +00:00
Riyaz Faizullabhoy
56d5a5a711 Merge pull request #1021 from justincormack/c-compile
Use docker run to compile C code not docker build
2017-01-16 17:44:47 +00:00
Riyaz Faizullabhoy
a582bc0a90 Merge pull request #1027 from riyazdf/kernel-bump
Update to 4.9.4 and 4.4.43
2017-01-16 17:44:35 +00:00
Riyaz Faizullabhoy
5865612b93 Update to 4.9.4 and 4.4.43
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-16 16:59:31 +00:00
Justin Cormack
d3fcfb7ed7 Merge pull request #1023 from justincormack/go-compile-cleanup
Clean up go-compile
2017-01-15 20:48:45 +00:00
Justin Cormack
6a315fab59 Clean up go-compile
- remove unused `--docker` option
- neater output for stages of check, build

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-15 19:43:03 +00:00
Justin Cormack
30b0d4d6b5 Merge pull request #1022 from justincormack/extra-riddler
Delete unnecessary file
2017-01-15 19:38:44 +00:00
Justin Cormack
1866083fb8 Delete unnecessary file
Left behind after rework earlier.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-15 17:41:48 +00:00
Justin Cormack
b5d9ff8cda Use docker run to compile C code not docker build
C version of #1006

Note that I switched all the C builds to use -O2 and that meant
that the compiler found some more warnings so I also fixed these
up. The possibly undefined ones were harmless, the aliasing one
is now more correct.

As these are small programs, the caching from `docker build` makes
no real difference, and worst case compile time is much better.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-15 15:55:14 +00:00
Justin Cormack
c074790a28 Merge pull request #1020 from justincormack/toybox-clean
Clean up build to not use alpine-build-c where not needed
2017-01-15 15:23:37 +00:00
Justin Cormack
421afc5000 Clean up build to not use alpine-build-c where not needed
Makes updates simpler.

Makes it explicit that `perf` currently requires Alpine 3.4, and update kernel version.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-15 14:07:46 +00:00
Justin Cormack
d6f8152d1a Merge pull request #1019 from justincormack/alpine-go
Update to golang:1.7-alpine3.5 images
2017-01-15 11:32:00 +00:00
Justin Cormack
a2dbd803c6 Merge pull request #1018 from justincormack/proxy-cleanup
Remove unnecessary file from proxy
2017-01-15 11:31:40 +00:00
Justin Cormack
5cfb149637 Update to golang:1.7-alpine3.5 images
Now there is an Alpine 3.5 variant of the Go 1.7 images, use this.

fix #972

Note updated the containers/binfmt image as this will be converted
to go-compile shortly, at which point alpine-build-go can be removed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-14 09:41:12 +00:00
Justin Cormack
be6ab94db4 Remove unnecessary file from proxy
Was missed in cleanup in #1006

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-14 09:27:40 +00:00
Riyaz Faizullabhoy
6f07ca1a8f Merge pull request #1016 from justincormack/kernel-test-quiet
Less verbose kernel config test
2017-01-13 16:46:32 -08:00
Justin Cormack
ce281442d1 Less verbose kernel config test
As `grep` echoes the output, no need to have `set -x` on this script,
make output smaller and cleaner.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-14 00:09:50 +00:00
Justin Cormack
fe250cf775 Merge pull request #1014 from justincormack/dockerup
Update Docker to 1.13.0-rc7
2017-01-13 22:11:52 +00:00
Justin Cormack
7982de1545 Update Docker to 1.13.0-rc7
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-13 21:48:21 +00:00
Justin Cormack
d2655a92f1 Merge pull request #1006 from justincormack/go-compile
Compile Go code with docker run not docker build
2017-01-13 19:15:22 +00:00