Commit Graph

1389 Commits

Author SHA1 Message Date
Justin Cormack
b46eb7f3d9 Enable local service
Files in `/etc/local.d/` will be executed:

If a file in this directory is executable and it has a .start extension,
it will be run when the local service is started. If a file is
executable and it has a .stop extension, it will be run when the local
service is stopped.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-22 13:39:10 +01:00
Justin Cormack
a72a9775df Merge pull request #538 from justincormack/iso-rework
Standalone make iso image, rather than build+run
2016-09-22 13:26:24 +01:00
Justin Cormack
2d483a20b0 Standalone make iso image, rather than build+run
Simpler to have an image that takes the kernel and initrd as input,
rather than building them into the image.

The rest need converting.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-22 13:12:23 +01:00
Justin Cormack
340f37d93c Merge pull request #534 from kencochrane/fix_makefile_ami_build
Added missing ENV variables to AMI build
2016-09-21 09:57:11 +01:00
Ken Cochrane
c1b826d248 Added missing ENV variables to AMI build
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
2016-09-20 19:09:09 -04:00
Justin Cormack
09cf619b11 Merge pull request #530 from justincormack/base-image-docs
More docs on Hub images
2016-09-20 23:02:31 +01:00
Justin Cormack
0d5f824057 Merge pull request #532 from kencochrane/aws_nightly
Added more tagging to AMI builds for AWS
2016-09-20 20:33:53 +01:00
Ken Cochrane
8f87c5c223 Added changes to support nightly builds for AWS 2016-09-20 15:20:09 -04:00
Justin Cormack
68a8698003 More docs on Hub images
See #529

Could be expanded further.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-20 18:10:21 +01:00
Justin Cormack
8683f7119c Merge pull request #528 from justincormack/manifest
Add package manifest for base image
2016-09-20 13:08:52 +01:00
Justin Cormack
6488328b69 Add package manifest for base image
See #527

Easy to see what has been updated via diffs.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-20 12:48:34 +01:00
Justin Cormack
6c5e2e47a1 Merge pull request #526 from justincormack/update-base
update base image
2016-09-20 12:18:08 +01:00
Justin Cormack
540bfe2d2e update base image
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-20 09:49:43 +01:00
Justin Cormack
63126a3817 Merge pull request #525 from justincormack/more-aio
Increase default fs.aio-max-nr
2016-09-20 00:17:03 +01:00
Justin Cormack
ed88a46f97 Increase default fs.aio-max-nr
As recommended by Oracle for MySQL.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-19 23:38:26 +01:00
Justin Cormack
6f7568d5ed Merge pull request #524 from rneugeba/kern-up
linux: update kernel to 4.4.21
2016-09-19 19:58:31 +01:00
Rolf Neugebauer
593d3f907e linux: update kernel to 4.4.21
- removed some Hyper-V patches which were picked up
  between 4.4.20 and 4.4.21
- udate aufs

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-19 18:20:28 +01:00
Justin Cormack
2ffbded469 Merge pull request #523 from justincormack/etcfiles
better dependency checking for etc
2016-09-16 17:58:36 +01:00
Justin Cormack
f8315e40b4 better dependency checking for etc
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-16 17:02:53 +01:00
Justin Cormack
61bf385e3e Merge pull request #522 from justincormack/rngd
Add rngd
2016-09-16 16:03:48 +01:00
Justin Cormack
468c8ba010 Add rngd
Tweak the config to use RDSEED or (fallback) RDRAND. Makes sure
we have initial random seed in cases where there is no other
random source if these are supported.

The default config in Alpine currently disables these, which makes
it pretty useless, as there is no motherboard rng support any more.

Replaces #517
Fix #514
Fix #183

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-16 15:32:56 +01:00
Justin Cormack
94cf16b4e9 Merge pull request #465 from rneugeba/c-style
Unify C coding style to the Linux kernel coding style (mostly)
2016-09-16 13:18:36 +01:00
Justin Cormack
40b44cde2f Merge pull request #521 from justincormack/curl
Add curl to base
2016-09-16 13:18:19 +01:00
Justin Cormack
a81485c79f Add curl to base
We need this to self host if you specify a custom version of Docker.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-16 12:54:03 +01:00
Justin Cormack
a911d46cd6 Merge pull request #520 from justincormack/no-community
Explicitly set the apk repositories we use
2016-09-16 12:48:42 +01:00
Rolf Neugebauer
deffc1f143 docs: add a short document about coding style recommendation
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:30 +01:00
Rolf Neugebauer
e2e123e464 tap-vsockd: better error handling
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
839a65c0bd 9pmount: Don't init variables if they are unconditionally assigned later
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
3c30271f3c transfused: Use Linux coding style (mostly)
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
1a289d04e5 tap-vsockd: Use Linux coding style (mostly)
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
6df7fae1a9 9pmount: Use Linux coding style (mostly)
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Justin Cormack
4b9b8295c5 Explicitly set the apk repositories we use
Previously we used the defaults (main and community) but we
currently only need main, but are likely to need some packages
from edge soon.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-16 10:58:54 +01:00
Justin Cormack
530125e0f9 Merge pull request #477 from nathanleclaire/there_is_no_volume_only_tar
Build without bind mounts for cloud editions
2016-09-15 16:06:49 +01:00
Justin Cormack
048ee3abfd Merge pull request #516 from justincormack/random-seed-key
add random-seed database key
2016-09-15 16:01:58 +01:00
Justin Cormack
4a4a40f1df add random-seed database key
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-15 13:16:51 +01:00
Nathan LeClaire
a6e3f92b95 Migrate cloud build off of bind mounts
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-09-14 15:38:05 -07:00
Justin Cormack
023d9c624c Merge pull request #508 from justincormack/autologin
Do not prompt for username at login
2016-09-14 13:51:07 +01:00
Justin Cormack
9305b37153 Do not prompt for username at login
Given you can login as root with no password on the console,
asking which user you would like to login as is rather pointless.

Do have to tweak /etc/issue though as busybox getty does not display it
without a prompt, and we want a whale.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-14 11:38:55 +00:00
Justin Cormack
b1c0981634 Merge pull request #510 from justincormack/nolog
No log driver for large copies
2016-09-14 12:35:25 +01:00
Justin Cormack
709f180fe3 Merge pull request #511 from justincormack/media-typo
fix media prefix
2016-09-14 12:28:55 +01:00
Justin Cormack
36524eef6c fix media prefix
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-14 12:28:25 +01:00
Ian Campbell
c0dc9ca877 Merge pull request #499 from ijc25/vsock-v6-patches
Vsock v6 patches
2016-09-14 12:13:20 +01:00
Ian Campbell
81b86d111a kernel: Replace vsock email series with upstream patches
The vsock patches were merged into mainline in v4.8-rc1, replace the patches
based on the email posting with cherry-picks. The patches appear identical so
the only change here is to the annotation of the origin which now references an
upstream commit instead of a message-id.

Add one new upstream patch b226acab2f6a "VSOCK: Use kvfree()"

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-09-14 10:03:10 +01:00
Ian Campbell
8c015fd22c kernel: Update vsock patches to RFC v6
Series is at <1469716595-13591-1-git-send-email-stefanha@redhat.com>.

This corresponds to v7 of the spec, posted in
<1470324277-19300-1-git-send-email-stefanha@redhat.com>

Also add a "cherry-picked from" to the "vsock: make listener child lock
ordering explicit" patch and move it to the head of the series with the other
vsock backports.

Finally backport three new upstream fixes:
3fda5d6e5801 vhost/vsock: fix vhost virtio_vsock_pkt use-after-free
28ad55578b8a virtio-vsock: fix include guard typo
21bc54fc0cdc vhost/vsock: drop space available check for TX vq

These were made on top of the version of the vsock patches which were added to
Linux master in v4.8-rc1. This commit is based on the email posting, will
replace with with proper cherry-pick separately.

Requires corresponding backend changes in Hyperkit

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-09-14 10:03:10 +01:00
Justin Cormack
72a2e4b90f No log driver for large copies
Takes 75% of the time without logs.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-14 09:05:36 +01:00
Justin Cormack
3d67c0ef6c Merge pull request #507 from justincormack/no-nginx-in-test
run tests with only alpine image, not nginx to make faster
2016-09-14 00:14:59 +01:00
Justin Cormack
7c9e05ff46 run tests with only alpine image, not nginx to make faster
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-13 23:21:44 +01:00
Justin Cormack
77138de2b9 Merge pull request #498 from justincormack/docker-bundle
Add support for running a development bundle of Docker
2016-09-13 22:47:57 +01:00
Justin Cormack
9a96f5da8c Add support for running a development bundle of Docker
Add a database key `bundle` that contains a path to a Docker dev
bundle eg `/.../docker/bundles/1.13.0-dev` where the docker
binaries to run can be found. This will be paired with a script
in `docker/docker` to set this key, so users can easily help
contribute to Docker development.

The change will be permanent until the key is removed or a factory
reset is done, or the bundle cannot be found.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-13 22:46:27 +01:00
Justin Cormack
810448b090 Merge pull request #505 from justincormack/missing-arch
fix kernel build missing arch
2016-09-13 22:30:55 +01:00