Commit Graph

1497 Commits

Author SHA1 Message Date
Riyaz Faizullabhoy
25b2d47f1d Add page_poison=1 to boot args
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-13 10:16:46 -08:00
Justin Cormack
0a43565d9a Merge pull request #1124 from riyazdf/apk-audit
Use apk audit to check system binaries
2017-02-13 11:41:14 +00:00
Justin Cormack
726bfc5806 Merge pull request #1179 from justincormack/mv-conttainers
Move containers directory to alpine directory
2017-02-13 11:38:41 +00:00
Justin Cormack
53399b98be Move containers directory to alpine directory
Not using this with new tool, so leave for editions.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 11:10:13 +00:00
Riyaz Faizullabhoy
1d548cfa1a Merge pull request #1173 from nathanleclaire/azure_bump_vhd
Bump Azure digest and version for 1.13.1
2017-02-09 16:24:02 -08:00
Nathan LeClaire
578f40ac47 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
Nathan LeClaire
a067dfe6d3 Merge pull request #1169 from nathanleclaire/system_con_fix
Fix system container bug
2017-02-09 15:38:16 -08:00
Justin Cormack
155676ee21 Do not try to run metrics proxy when not configured
Failure test case was not correct; printed a (harmless) error message
that was confusing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-09 13:58:03 +00:00
Nathan LeClaire
7459a4bfad Fix system container bug
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-02-08 17:02:14 -08: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
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
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
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
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
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
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
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
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
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
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
Justin Cormack
a6416a1214 Merge pull request #1121 from justincormack/fsck-y
Try to fsck harder
2017-01-31 17:50:16 +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
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
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
David Sheets
85f401ac79 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
b10d61a94b 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
483ea5cb81 Merge pull request #1112 from justincormack/patchfilesfix
Clean up patch copying
2017-01-29 21:34:38 +00:00
Justin Cormack
dfa8321eba 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