github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity
2,104 Commits 1 Branch 27 Tags 240 MiB
533a8d48fe
Commit Graph

2104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
533a8d48fe Update Docker to 1.13.1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-08 09:34:57 +00:00
Riyaz Faizullabhoy
fc6917ca65 Merge pull request #1144 from riyazdf/1.13.1-rc2-bump 
1.13.1-rc2 docker bump
 2017-02-06 21:50:35 -08:00
Justin Cormack
f3542006c6 Merge pull request #1160 from rneugeba/patch-up 
kernel: Rebase kernel patches proper
 2017-02-06 18:16:39 +00:00
Rolf Neugebauer
82c454a794 kernel: Rebase kernel patches proper 
Regenerate the kernel patches from
https://github.com/rneugeba/linux-stable/

Note, the last two 4.9 patches are no properly
cherry-picked from linux-next. We previously had
0011-Drivers-hv-vmbus-Use-all... from an email.
0012-Drivers-hv-Log-the... is new, but may further aid
debugging version mismatch issues.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-02-06 17:57:26 +00:00
Rolf Neugebauer
dcff3b9cd0 Merge pull request #1158 from riyazdf/kernup 
Update kernel to 4.9.8 and 4.4.47
 2017-02-06 17:48:59 +00:00
Riyaz Faizullabhoy
83a8b220b1 Update kernel to 4.9.8 and 4.4.47 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-02-06 09:14:35 -08:00
Justin Cormack
501b00de29 Merge pull request #1156 from justincormack/top-level-dockerfiles 
Simpler media Dockerfiles
 2017-02-06 16:23:23 +00:00
Justin Cormack
84ae9017a5 Merge pull request #1157 from justincormack/restore-containerd 
Restore containerd and runc images
 2017-02-06 16:23:12 +00:00
Justin Cormack
4fa7e902c4 Restore containerd and runc containers 
These were removed in #1145

Need these for a new build; keeping the current build in the
`alpine/` directory unchanged for editions for now so the issues
here do not affect them.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 16:08:11 +00:00
Justin Cormack
893afc851f Merge pull request #1155 from justincormack/hyper-script 
Move hyperkit script to scripts directory
 2017-02-06 15:51:45 +00:00
Justin Cormack
3f71568285 Simpler media Dockerfiles 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 15:50:40 +00:00
Justin Cormack
0eeb188e26 Move hyperkit script to scripts directory 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 15:28:32 +00:00
Justin Cormack
5f2f44ba69 Merge pull request #1154 from justincormack/aufsup 
Update aufs to 20170206
 2017-02-06 12:20:17 +00:00
Justin Cormack
9a72b30756 Update aufs to 20170206 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 11:57:30 +00:00
Justin Cormack
14e9a54c26 Merge pull request #1153 from justincormack/fix-media 
Fix up directory moves in media Dockerfile
 2017-02-06 11:16:49 +00:00
Justin Cormack
fbdbec4376 Fix up directory moves in media Dockerfile 
These broke pushing from master

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 11:01:09 +00:00
Justin Cormack
bde5f41e1e Merge pull request #1152 from justincormack/mv-test2 
Explicitly build the containers we want in alpine/ directory
 2017-02-05 08:59:06 +01:00
Justin Cormack
e674588a0c Explicitly build the containers we want in alpine/ directory 
This will be kept for editions until the new fully containerised
version can replace it.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-04 14:47:00 +01:00
Justin Cormack
e3ae0617d1 Merge pull request #1146 from justincormack/mv-kernel 
Move kernel directory to top level
 2017-02-04 12:02:25 +01:00
Justin Cormack
a4c999f934 Merge pull request #1137 from justincormack/prometheus 
Forward Prometheus metrics to host if enabled
 2017-02-04 09:19:05 +01:00
Justin Cormack
2fdf0918b3 Move kernel directory to top level 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-04 09:17:16 +01:00
Justin Cormack
5964e9640c Merge pull request #1148 from riyazdf/kernel-bump 
Update kernel to 4.9.7 and 4.4.46
 2017-02-04 09:16:19 +01:00
Riyaz Faizullabhoy
6a1dd2d9e9 Update kernel to 4.9.7 and 4.4.46 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-02-03 17:47:11 -08:00
Riyaz Faizullabhoy
0fee2c5a45 Merge pull request #1145 from riyazdf/revert-containerd 
Revert to non-development containerd and runc until nats port is sorted out
 2017-02-02 13:46:33 -08:00
Riyaz Faizullabhoy
0003deabea Revert to non-development containerd and runc until nats port is sorted out 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-02-02 11:57:28 -08:00
Riyaz Faizullabhoy
48ab5cdc82 1.13.1-rc2 docker bump 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-02-02 09:33:46 -08:00
Riyaz Faizullabhoy
55fb1f40dc Merge pull request #1143 from dgageot/fix-ami 
Fix AMI build - Invalid reference format
 2017-02-02 08:39:51 -08:00
David Gageot
6b348e7208 Fix AMI build - Invalid reference format 
Signed-off-by: David Gageot <david@gageot.net>
 2017-02-02 17:15:21 +01:00
Justin Cormack
93390f220b Merge pull request #1140 from dgageot/fix-1139 
Wait for /dev/sda1 to be populated by `mdev -s`
 2017-02-02 15:37:32 +00:00
Justin Cormack
5aca78d5bd Merge pull request #1136 from dgageot/fix-bucket 
Fix the bucket used to upload gce images
 2017-02-02 15:37:16 +00:00
David Gageot
4faf5a5c9a Wait for /dev/to be populated by mdev -s 
Fixes #1139

Signed-off-by: David Gageot <david@gageot.net>
 2017-02-02 16:20:47 +01:00
Justin Cormack
f13dec41d0 Forward Prometheus metrics to host if enabled 
Set your daemon.json to something like:
```
{
	"experimental": true,
	"metrics-addr": "0.0.0.0:4999"
}
```

and your metrics will be at `localhost:4999/metrics`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-02 11:51:24 +00:00
David Gageot
470c4b5487 Fix the bucket used to upload gce images 
Signed-off-by: David Gageot <david@gageot.net>
 2017-02-02 11:55:34 +01:00
Justin Cormack
2a468e0f80 Merge pull request #1135 from justincormack/reuse-hyperkit 
Use hyperkit and slirp from Docker for Mac install if available
 2017-02-02 09:07:54 +00:00
Justin Cormack
8cc6ca7e40 Use hyperkit and slirp from Docker for Mac install if available 
Save some downloading as the user probably has these installed
already; still fall back if not found to downloading from CI.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-02 08:48:50 +00:00
Justin Cormack
a059f6e3fa Merge pull request #1102 from RobbKistler/1046-no-docker 
OS X CI test without docker installed
 2017-02-02 08:46:39 +00:00
Robb Kistler
0fde2a1aa2 OS X CI test without docker installed 
OS X CI endpoints won't need to do a build, the artifacts can be pulled
from mobylinux/media.  This requires docker, which may not be available.

- 'get-regextract' make target pulls media without Docker using the
  regextract utility, which it will fetch from CI if needed.
- Add initrd-test.img to mobylinux/media image

Addresses #1046

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
 2017-02-01 19:47:53 -08:00
Justin Cormack
c66cecdd9c Merge pull request #1134 from justincormack/testup 
Update test container
 2017-02-02 00:17:58 +00:00
Justin Cormack
7292e65c53 Update test container 
Use the new longer tag/sha hashes

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-02 00:05:41 +00:00
Justin Cormack
65f32f9d73 Merge pull request #1132 from justincormack/mv-test 
Move test directory to top level
 2017-02-01 23:58:04 +00:00
Justin Cormack
aea6b59f17 Merge pull request #1133 from justincormack/mv-readme 
Move README about vhd to cloud directory
 2017-02-01 23:55:46 +00:00
Justin Cormack
37a75d7438 Move README about vhd to cloud directory 
This is cloud specific so best there while moving stuff...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-01 23:38:43 +00:00
Justin Cormack
b6f499dca5 Move test directory to top level 
This is temporary, it should be under `containers/` just as soon
as we have a manifest setup.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-01 23:34:21 +00:00
Justin Cormack
40ce4c4673 Merge pull request #1131 from justincormack/mv-containers 
Move containers directory to top level
 2017-02-01 23:08:47 +00:00
Justin Cormack
8477ee9dc2 Merge pull request #1130 from justincormack/mk-baseimage 
Replace mkinitrd.sh with a tool to convert base image to initrd
 2017-02-01 22:58:37 +00:00
Justin Cormack
364a7bb0fe Move containers directory to top level 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-01 22:56:55 +00:00
Justin Cormack
3bb08ae6d6 Replace mkinitrd.sh with a tool to convert base image to initrd 
Better split between content and tools.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-01 22:32:34 +00:00
David Sheets
59947ad010 transfused perfstat: fix bug with running multiple perfstats in a row (#1129) 
After freeing the head of the perfstat block list, we must set it to NULL
to indicate that new blocks must be allocated. Previously, we risked
segfaults by trying to use a freed list.

Signed-off-by: David Sheets <dsheets@docker.com>
 2017-02-01 20:24:21 +00:00
Justin Cormack
031be1e1f9 Merge pull request #1128 from justincormack/bin 
Use bin dir and clean up hyperkit test
 2017-02-01 16:24:34 +00:00
Justin Cormack
7910f7e1be Use bin dir and clean up hyperkit test 
- make a `bin/` directory
- make hyperkit-test pass, as it writes to pty so redirect was not working

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-01 14:15:52 +00:00