github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity
2,220 Commits 1 Branch 27 Tags 240 MiB
24c7e6eeb6
Commit Graph

2220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Justin Cormack
3e020abdb2 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
Justin Cormack
6724a8780d Merge pull request #1126 from justincormack/move-ebpf 
Move ebpf to top level
 2017-02-01 11:41:43 +00:00
Justin Cormack
ad528b4bea Merge pull request #1123 from dsheets/transfused-perfstat 
transfused perfstat
 2017-02-01 11:04:14 +00:00
Justin Cormack
1dfa213db0 Move ebpf to top level 
Do not build by default, as we are not using yet.

Clean up the gitignores at the same time as they were affected.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-01 10:58:52 +00:00
Justin Cormack
64ba23d33f Merge pull request #1125 from justincormack/welcome 
Minimise the motd
 2017-01-31 21:30:10 +00:00
Justin Cormack
30d0b59b8d Minimise the motd 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-31 21:02:57 +00:00
Riyaz Faizullabhoy
2cdefa184e Use apk audit to check system binaries 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-01-31 11:33:11 -08:00
Justin Cormack
0ede7d930b Merge pull request #1098 from riyazdf/tools-dir 
Split base/ into base/ and tools/
 2017-01-31 18:07:35 +00:00
David Sheets
dc7069db1c transfused: add perfstat machinery 
This adds two new control channel requests, START_PERFSTAT and
STOP_PERFSTAT, that begin and end performance statistics collection
respectively. START_PERFSTAT takes the name of the mountpoint on which
to enable statistics collection and returns the current monotonic time.
STOP_PERFSTAT takes the name of the mountpoint on which to disable
statistics collection and returns the current monotonic time and the
message timings that have been collected.

Performance statistics are collected in a linked list of blocks. pthread
locks are used for synchronization.

Signed-off-by: David Sheets <dsheets@docker.com>
 2017-01-31 18:07:31 +00:00
Riyaz Faizullabhoy
d66bc2d501 Split base/ into base/ and tools/ 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-01-31 09:52:30 -08:00
Justin Cormack
a6416a1214 Merge pull request #1121 from justincormack/fsck-y 
Try to fsck harder
 2017-01-31 17:50:16 +00:00
Justin Cormack
9fdbcf3e2e Merge pull request #1122 from riyazdf/tag-fmt 
Reformat tags before digests
 2017-01-31 17:49:26 +00:00
Riyaz Faizullabhoy
56899b318d reformat tags before digests 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-01-31 09:33:06 -08:00
Justin Cormack
64bcf1adce Try to fsck harder 
This will potentially leave stuff in lost+found but may be able to
recover from more filesystem corruption.

See #736

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-31 12:42:37 +00:00
Justin Cormack
76c20080d9 Merge pull request #1120 from justincormack/checkconfigup 
Update check-config script
 2017-01-31 10:55:47 +00:00
Justin Cormack
db101a1e06 Update check-config script 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-31 10:31:26 +00:00
Justin Cormack
101777fdc0 Merge pull request #1118 from justincormack/gce-cleanup 
Clean up GCE image build
 2017-01-31 09:20:06 +00:00
Justin Cormack
699560aaad Clean up GCE image build 
In line with the others, support any file names on input.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-30 22:04:34 +00:00
Justin Cormack
38b6847669 Merge pull request #1116 from justincormack/iso-cleanup 
Cleanup BIOS ISO builds
 2017-01-30 20:32:23 +00:00
Riyaz Faizullabhoy
c3b393625e Merge pull request #1114 from justincormack/goupflag 
Update Go to 1.7.5 and remove unnecessary linker flag
 2017-01-30 09:21:26 -08:00
Justin Cormack
0fca0245c4 Cleanup BIOS ISO builds 
- do not require specific filenames for input
- change EFI build to use `docker run`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-30 15:18:06 +00:00
Justin Cormack
ddb41952ef Update Go to 1.7.5 and remove unnecessary linker flag 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-30 14:10:41 +00:00