github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 11:25:40 +00:00
Code Issues Projects Releases Wiki Activity
1,351 Commits 1 Branch 27 Tags 240 MiB
f16cfb94c9
Commit Graph

1351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Justin Cormack
6c0a0bf2fe fix kernel build missing arch 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-13 22:30:26 +01:00
Justin Cormack
0265605a1f Merge pull request #503 from justincormack/make-circular 
fix dependency loop
 2016-09-13 22:19:36 +01:00
Justin Cormack
0e2b57f108 Merge pull request #502 from justincormack/kernel-make 
Clean up kernel Makefile
 2016-09-13 22:18:39 +01:00
Justin Cormack
318660fae3 fix dependency loop 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-13 22:14:49 +01:00
Justin Cormack
a0b1153d93 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
26c4afd570 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
2ca2b399be 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
a4db268933 Remove desktop move 2016-09-13 13:26:15 -07:00
Ken Cochrane
3a5d68acbf 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
654e47ad1c reorder kernel Dockerfile 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-13 21:15:34 +01:00
Justin Cormack
eaeea2dfb8 Merge pull request #491 from justincormack/make-cleanup 
Make cleanup
 2016-09-13 20:09:25 +01:00
French Ben
3ee78ad66b Added licensing zip from container to prevent user login leak 2016-09-13 11:28:07 -07:00
Justin Cormack
1525dacf32 document the Docker Hub repos 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 20:35:04 +01:00
Justin Cormack
a12411b794 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
5e4e7d1c7f 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
9c88f78262 gitignore vi swp files 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
9b2e1367f9 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
955aad6276 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
145dead110 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
35070c03f7 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
8ed08dcdda 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
459809929c update README with build reqs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
206dfe0950 simplify vendor tar 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
91fbb9c245 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
4ac419e663 Add mobylinux.efi to media 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
85158fec4d make bios iso by default 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:36:01 +01:00
Justin Cormack
6fdcb8716a 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
cd6507f1d0 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
7d08c3f9c1 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
5c79c1caf8 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
98fee5bd32 no longer need dockerignore 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
a99eec5151 Set CMD to mkinitrd 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
cb9178f314 Use our own qemu base image 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
c0fe2b959d fix Makefile dependencies 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00
Justin Cormack
5d2ad6db2b 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
af85abc84d 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
18912fa3b5 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
43ab6520cf update to latest alpine base images 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +01:00