github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity
2,091 Commits 1 Branch 27 Tags 240 MiB
e66a558a59
Commit Graph

2091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
e66a558a59 Merge pull request #1166 from justincormack/dockerup 
Update Docker to 1.13.1
 2017-02-08 09:53:07 +00:00
Justin Cormack
5256eb0263 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
83b9afce02 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
364afbfb9a Merge pull request #1160 from rneugeba/patch-up 
kernel: Rebase kernel patches proper
 2017-02-06 18:16:39 +00:00
Rolf Neugebauer
5af19ac52b 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
b99df54a98 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
46fde10eaf 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
65e2c49ca2 Merge pull request #1156 from justincormack/top-level-dockerfiles 
Simpler media Dockerfiles
 2017-02-06 16:23:23 +00:00
Justin Cormack
e98cc781e2 Merge pull request #1157 from justincormack/restore-containerd 
Restore containerd and runc images
 2017-02-06 16:23:12 +00:00
Justin Cormack
73e4be3139 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
f932384ffd Merge pull request #1155 from justincormack/hyper-script 
Move hyperkit script to scripts directory
 2017-02-06 15:51:45 +00:00
Justin Cormack
38ef228b7b Simpler media Dockerfiles 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 15:50:40 +00:00
Justin Cormack
4aa0444c92 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
8aabf316e7 Merge pull request #1154 from justincormack/aufsup 
Update aufs to 20170206
 2017-02-06 12:20:17 +00:00
Justin Cormack
2470af59a0 Update aufs to 20170206 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 11:57:30 +00:00
Justin Cormack
d7cea0f8cc 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
66a803a0a7 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
080008de16 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
69346b6cf4 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
f524a1eb5a Merge pull request #1146 from justincormack/mv-kernel 
Move kernel directory to top level
 2017-02-04 12:02:25 +01:00
Justin Cormack
42b75bdeb7 Merge pull request #1137 from justincormack/prometheus 
Forward Prometheus metrics to host if enabled
 2017-02-04 09:19:05 +01:00
Justin Cormack
3f81edee37 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
f6c5995a6f 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
d7a8e01d7b 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
6309dd88b3 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
a29b6c1391 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
4fe7784ad1 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
19baaed651 Merge pull request #1143 from dgageot/fix-ami 
Fix AMI build - Invalid reference format
 2017-02-02 08:39:51 -08:00
David Gageot
334f90974d Fix AMI build - Invalid reference format 
Signed-off-by: David Gageot <david@gageot.net>
 2017-02-02 17:15:21 +01:00
Justin Cormack
c3ede807c3 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
a9629a9098 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
e2a4c42457 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
7327d374ec 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
b4e2bfbab6 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
2b1a26e5df 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
aff2b5f514 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
40fb18a4cc 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
57ee2eae95 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
9ae88b51f9 Merge pull request #1134 from justincormack/testup 
Update test container
 2017-02-02 00:17:58 +00:00
Justin Cormack
e211318453 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
c30c9db256 Merge pull request #1132 from justincormack/mv-test 
Move test directory to top level
 2017-02-01 23:58:04 +00:00
Justin Cormack
f0621a6aed 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
3f99b0b23f 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
7b7e672270 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
d61ae694d0 Merge pull request #1131 from justincormack/mv-containers 
Move containers directory to top level
 2017-02-01 23:08:47 +00:00
Justin Cormack
6dfadc6287 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
2db23f8d18 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
9fe9e95349 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
2e39ad92e2 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
ec8c047835 Merge pull request #1128 from justincormack/bin 
Use bin dir and clean up hyperkit test
 2017-02-01 16:24:34 +00:00