Commit Graph

1386 Commits

Author SHA1 Message Date
Justin Cormack
fad65eb40b Merge pull request #523 from justincormack/etcfiles
better dependency checking for etc
2016-09-16 17:58:36 +01:00
Justin Cormack
d78f86feb2 better dependency checking for etc
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-16 17:02:53 +01:00
Justin Cormack
8fcea65bea Merge pull request #522 from justincormack/rngd
Add rngd
2016-09-16 16:03:48 +01:00
Justin Cormack
1aef768a33 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
7787e3622c 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
c1e0c731d1 Merge pull request #521 from justincormack/curl
Add curl to base
2016-09-16 13:18:19 +01:00
Justin Cormack
519921279c 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
a3fbee70e7 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
8d8c735c09 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
eee8a92d03 tap-vsockd: better error handling
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
082a66d1ea 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
31430016b2 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
afb6b0b830 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
3f63cfb3b7 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
7100477e54 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
d397dad1bd 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
e497aea7b8 Merge pull request #516 from justincormack/random-seed-key
add random-seed database key
2016-09-15 16:01:58 +01:00
Justin Cormack
365883b887 add random-seed database key
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-15 13:16:51 +01:00
Nathan LeClaire
e9b7803867 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
e5bced32d1 Merge pull request #508 from justincormack/autologin
Do not prompt for username at login
2016-09-14 13:51:07 +01:00
Justin Cormack
37fe023e06 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
5c2bdf7b2a Merge pull request #510 from justincormack/nolog
No log driver for large copies
2016-09-14 12:35:25 +01:00
Justin Cormack
e82f32d1fa Merge pull request #511 from justincormack/media-typo
fix media prefix
2016-09-14 12:28:55 +01:00
Justin Cormack
26159df061 fix media prefix
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-14 12:28:25 +01:00
Ian Campbell
a4e2b5d4d1 Merge pull request #499 from ijc25/vsock-v6-patches
Vsock v6 patches
2016-09-14 12:13:20 +01:00
Ian Campbell
927f473b20 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
c41f680f7d 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
c522ca1d31 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
8a03f15446 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
34c98991e3 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
58d4ededaa 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
f19a699715 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
a988fe3bad Merge pull request #505 from justincormack/missing-arch
fix kernel build missing arch
2016-09-13 22:30:55 +01:00
Justin Cormack
a6fc00e41b fix kernel build missing arch
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-13 22:30:26 +01:00
Justin Cormack
ebf68dd7d7 Merge pull request #503 from justincormack/make-circular
fix dependency loop
2016-09-13 22:19:36 +01:00
Justin Cormack
afef0e079a Merge pull request #502 from justincormack/kernel-make
Clean up kernel Makefile
2016-09-13 22:18:39 +01:00
Justin Cormack
1e0f7dee31 fix dependency loop
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-13 22:14:49 +01:00
Justin Cormack
99dcbdf322 Rework kernel Makefile
Do not delete build container on `make clean`, as it should be fine
to reuse cached layers.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-13 21:49:14 +01:00
Justin Cormack
82dea643ea Merge pull request #500 from FrenchBen/licensing
Added licensing zip from container to prevent user login leak
2016-09-13 21:27:06 +01:00
Justin Cormack
76722caae7 Merge pull request #501 from kencochrane/cloud-clean
Added ability to make ami-clean-mount to clean up AMI volume mount
2016-09-13 21:26:48 +01:00
French Ben
1c5aebf6c4 Remove desktop move 2016-09-13 13:26:15 -07:00
Ken Cochrane
0f7daa08c3
Added ability to make ami-clean-mount to clean up AMI volume mount
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
2016-09-13 16:22:46 -04:00
Justin Cormack
3665ef0b82 reorder kernel Dockerfile
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-13 21:15:34 +01:00
Justin Cormack
28e1dd7517 Merge pull request #491 from justincormack/make-cleanup
Make cleanup
2016-09-13 20:09:25 +01:00
French Ben
7ebf59ba16 Added licensing zip from container to prevent user login leak 2016-09-13 11:28:07 -07:00
Justin Cormack
b96aa136b7 document the Docker Hub repos
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 20:35:04 +01:00
Justin Cormack
1664cebcf9 allow overriding the media prefix, so can make custom modifications eg for custom Docker versions
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:37:24 +01:00
Justin Cormack
a1f78bf3c9 rm docker container used for binary extraction
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:37:24 +01:00
Justin Cormack
b9fdd0fef3 gitignore vi swp files
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:36:01 +01:00
Justin Cormack
8acb1211c6 add experimental- prefix for experimental Docker versions in media
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:36:01 +01:00