github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-28 13:08:38 +00:00
Code Issues Projects Releases Wiki Activity
2,282 Commits 1 Branch 27 Tags 240 MiB
a17def07b4
Commit Graph

2282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Justin Cormack
eeef7d0923 Merge pull request #1126 from justincormack/move-ebpf 
Move ebpf to top level
 2017-02-01 11:41:43 +00:00
Justin Cormack
b06347acca Merge pull request #1123 from dsheets/transfused-perfstat 
transfused perfstat
 2017-02-01 11:04:14 +00:00
Justin Cormack
3bad70f18b 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
c26d07ae33 Merge pull request #1125 from justincormack/welcome 
Minimise the motd
 2017-01-31 21:30:10 +00:00
Justin Cormack
792398346e Minimise the motd 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-31 21:02:57 +00:00
Riyaz Faizullabhoy
c5e44b45f7 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
dca2e9dc3f Merge pull request #1098 from riyazdf/tools-dir 
Split base/ into base/ and tools/
 2017-01-31 18:07:35 +00:00
David Sheets
05052799c1 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
0c545c0c53 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
8be978e8d5 Merge pull request #1121 from justincormack/fsck-y 
Try to fsck harder
 2017-01-31 17:50:16 +00:00
Justin Cormack
5173022c49 Merge pull request #1122 from riyazdf/tag-fmt 
Reformat tags before digests
 2017-01-31 17:49:26 +00:00
Riyaz Faizullabhoy
2979ff0303 reformat tags before digests 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-01-31 09:33:06 -08:00
Justin Cormack
f663b2c9b5 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
542820c4f5 Merge pull request #1120 from justincormack/checkconfigup 
Update check-config script
 2017-01-31 10:55:47 +00:00
Justin Cormack
3325e130fe Update check-config script 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-31 10:31:26 +00:00
Justin Cormack
48fc7c5702 Merge pull request #1118 from justincormack/gce-cleanup 
Clean up GCE image build
 2017-01-31 09:20:06 +00:00
Justin Cormack
43f781eff1 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
9d2f6eb4a6 Merge pull request #1116 from justincormack/iso-cleanup 
Cleanup BIOS ISO builds
 2017-01-30 20:32:23 +00:00
Riyaz Faizullabhoy
59515b76b4 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
5bfe0a25a1 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
98a5810e6c 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
Justin Cormack
002971af7f Merge pull request #1094 from justincormack/sshd-new 
Add an sshd container
 2017-01-30 11:06:39 +00:00
David Sheets
56739f2613 transfused: keep a linked list of open connections 
Signed-off-by: David Sheets <dsheets@docker.com>
 2017-01-30 10:47:46 +00:00