github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-09 08:13:02 +00:00
Code Issues Projects Releases Wiki Activity
2,105 Commits 1 Branch 31 Tags
34b29f52afd342eba935fc23f7259bb05112d38c
Commit Graph

1488 Commits

Author SHA1 Message Date
Nathan LeClaire
34b29f52af Bump Azure digest and version for 1.13.1 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2017-02-09 15:59:25 -08:00
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
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
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
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
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
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
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
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
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
792398346e Minimise the motd 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-31 21:02:57 +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
Justin Cormack
8be978e8d5 Merge pull request #1121 from justincormack/fsck-y 
Try to fsck harder
 2017-01-31 17:50:16 +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
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
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
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
David Sheets
df5447791e transfused: rename some types to end in _t 
Signed-off-by: David Sheets <dsheets@docker.com>
 2017-01-30 10:37:06 +00:00
Justin Cormack
064c7bc00e Merge pull request #1112 from justincormack/patchfilesfix 
Clean up patch copying
 2017-01-29 21:34:38 +00:00
Justin Cormack
a9c4d66b27 Split kernel files into their own image 
This means the base system build and kernel build can be split
without dependencies, and just assembled later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-29 21:07:20 +00:00
Justin Cormack
6f9997cff3 Clean up patch copying 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-29 20:26:51 +00:00
Justin Cormack
1489dda256 Unmount database after copying 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-28 17:09:01 +00:00
Justin Cormack
b4f770f014 Fix mountpoint for mac 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-28 14:45:44 +00:00
Justin Cormack
a68dfd0195 Merge pull request #1108 from justincormack/osx-mountpoint 
Mount osx 9p db on /mnt
 2017-01-28 12:27:20 +00:00
Justin Cormack
9c2ea15c5c Mount osx 9p db on /mnt 
Otherwise interferes with transfused startup.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-28 12:03:02 +00:00
Justin Cormack
f246aa2656 Merge pull request #1107 from justincormack/dockerup 
Update to Docker 1.13.1-rc1
 2017-01-28 10:42:04 +00:00
Justin Cormack
94c3564c44 Update to Docker 1.13.1-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-28 10:16:15 +00:00
Justin Cormack
3d510aea71 Update to AUFS 20170130 
This now includes the patch we were carrying.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-28 10:11:57 +00:00
Rolf Neugebauer
f4286d8038 kernel: Update 4.9.6 patches 
- Update VMBus lockup patch (0009) based on the one submitted to LKML
- Remove hack to forcea TimeSync protocol to version 3 (0005)
- Properly cherry-pick patch 0008 (was missing the cherry-pick reference)
- Add a new patch which properly negotiates the TimeSync protocol (0012)
- The latter required cherry-picking 0010 and 0011

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-01-27 16:12:24 +00:00