github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-31 14:41:10 +00:00
Code Issues Projects Releases Wiki Activity
1,260 Commits 1 Branch 27 Tags 240 MiB
927f473b20
Commit Graph

1260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Justin Cormack
ba40e0a33b Use a random tag for Debian kernel build base 
To store all the old images they need a different tag, so use a
random one.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
b03d08ef4d do not need to remove images in make clean 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
3d0cd1deca Use a base image for building kernel 
As we do not have a simple way to hash Debian, use the Docker
sha256 until we switch to Alpine.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
e0395e9839 Make self hosting by adding make and GNU tar 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
ac96123081 update README with build reqs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
a1299f3d07 simplify vendor tar 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
0a6f4f6bf5 revert to debian for kernel build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
9f7e9ca168 Add mobylinux.efi to media 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
6594775ef6 make bios iso by default 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
ef2812a70a Add a media target to push final artefacts to tagged by commit id 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
bba6934f22 for release docker binaries we can fetch from docker hub rather than curl, so will be cached 
Allow override in case docker images not released

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
3f665f5e2a we never use uncompressed initrd, so always compress 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
59ad769b00 for now, make sure rebuild on make test 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
2482ed8f66 no longer need dockerignore 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
fcf47232f7 Set CMD to mkinitrd 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
0ce424ded4 Use our own qemu base image 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
a1edc6cec2 fix Makefile dependencies 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
cbbf3f35e3 do not need to delete reproducible images 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
cfcb0db741 reproducible builds for efi and bios isos 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
3a2a755f58 do not force rebuild from top level makefile 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
8646f76ed2 update to latest alpine base images 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
a40ded938c smaller contexts for efi and bios 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
4a4e755c91 remove broken arm functionality - will rework 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
53d44fb548 clean up main Dockerfile and Makefile to use exact correct context, tar input 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
c51a0b831e Simplify kernel output and main Dockerfile 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
92642978a1 simplify tar for vendor directory 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00