github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-14 14:04:31 +00:00
Code Issues Projects Releases Wiki Activity
2,187 Commits 1 Branch 31 Tags
4cbb9f27d641591b96be845a775372d7aa26d633
Commit Graph

1515 Commits

Author SHA1 Message Date
Justin Cormack
4cbb9f27d6 Merge pull request #1217 from FrenchBen/handle-bundles 
Added support for bundles generated from CI
 2017-02-28 13:37:47 -08:00
Justin Cormack
61291f0685 Upgrade to Docker 17.03.0-ce 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-28 12:59:52 -08:00
French Ben
b15b5326b4 Fixed docker version 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 17:01:58 -08:00
French Ben
a9849e776a Added bundle detection 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 16:19:29 -08:00
French Ben
924c0da2d2 Removed extra line 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 15:45:15 -08:00
French Ben
0263896388 Removed unneeded var 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:26:44 -08:00
French Ben
57c609f700 Flexible docker version 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:25:43 -08:00
French Ben
269e2c8157 Added support for bundles generated from CI 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:25:43 -08:00
Robb Kistler
e0269e0978 Allow docker engine to be pulled from s3 bucket 
Use aws cli to pull docker engine binaries from s3 bucket.  Conditional and
happens if DOCKER_BIN_URL begins with 's3://'

Example usage:
```
  export AWS_ACCESS_KEY_ID=key
  export AWS_SECRET_ACCESS_KEY=secret
  make DOCKER_BIN_URL=s3://path-to-engine-binaries
```
Signed-off-by: Robb Kistler <robb.kistler@docker.com>

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
 2017-02-23 20:32:00 -08:00
French Ben
816ce62ad5 Added quotes for curling 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-23 15:15:28 -08:00
Justin Cormack
e0db9f1074 Update Docker to 17.03.0-ce-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-20 10:52:41 +00:00
Riyaz Faizullabhoy
3053ac1725 Merge pull request #1202 from justincormack/go-up 
Update to Go 1.8
 2017-02-17 09:19:53 -08:00
Justin Cormack
d7e6d42963 Update to Go 1.8 
This includes most things except the containerd and runc builds
which I will do next time I update them.

Note that all golang:alpine images now for 1.8 are ALpine 3.5 based.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-17 16:31:19 +00:00
Justin Cormack
802c56bcd3 Update kernel config tests 
- `CONFIG_BUG_ON_DATA_CORRUPTION` is a 4.10 kernel only flag, so gate this.
- some config was duplicated on gated and normal config
- some 4.4 issues with the new config

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-17 14:52:32 +00:00
Justin Cormack
b18c907384 Merge pull request #1190 from justincormack/iburst 
Stop using dhcp ntp and fix the options used on OSX
 2017-02-16 08:50:31 +00:00
Robb Kistler
b4d18d867e Re-run mdev -s if /dev/sda1 isn't populated 
Fixes #1139

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
 2017-02-15 17:47:38 -08:00
Justin Cormack
9d64a6dea2 Stop using dhcp ntp and fix the options used on OSX 
The options added in de6e7f9cbe
were not applied for ntp configured servers.

As the address is always the same, stop using dhcp and just hard code this.
This should make sync work how it used to, ie quite well.

Also trust the GCP ntp server, as it is local and provided by infrastructure.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-15 17:54:41 +00:00
Justin Cormack
fd6169b607 Use ntp pool not single server for AWS 
Some of the servers are off by a lot, eg 7s in one case I saw.

SHould help with #1186

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-14 13:20:18 +00:00
Riyaz Faizullabhoy
7036d3d676 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
728978cf93 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
d83397cfd0 Merge pull request #1179 from justincormack/mv-conttainers 
Move containers directory to alpine directory
 2017-02-13 11:38:41 +00:00
Justin Cormack
3b26b76875 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
44e6801ec9 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
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
Nathan LeClaire
f438d42987 Merge pull request #1169 from nathanleclaire/system_con_fix 
Fix system container bug
 2017-02-09 15:38:16 -08:00
Justin Cormack
f290333c48 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
0ecaed9d0b Fix system container bug 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2017-02-08 17:02:14 -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