Commit Graph

1521 Commits

Author SHA1 Message Date
David Sheets
b75c4070d1 database-mac: clean up /mnt/db after use
Leaving this unnecessary directory in place caused docker/for-mac#1379.

Signed-off-by: David Sheets <dsheets@docker.com>
2017-03-03 13:08:15 +00:00
French Ben
8000e7d5ca Removed moby dependency for aws/gcp/azure
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 14:51:14 -08:00
French Ben
18222c638d Removed extra init packages
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 13:50:01 -08:00
French Ben
0276d52340 Removed extra cloud make
Signed-off-by: French Ben <frenchben@docker.com>
2017-03-02 13:49:08 -08:00
Justin Cormack
7177a9f9b7 Default to non experimental mode
Editions should set experimental in `daemon.json` if they want to
have it set.

See #1076 and https://github.com/docker/pinata/issues/6424

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-01 17:35:14 -08:00
Justin Cormack
a18c3d4c0a Remove ability to pull docker from hub
We never used this as updates too slow and out of our control.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-28 14:22:30 -08:00
Justin Cormack
edb48c0a13 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
54decb3626 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
66710a38a2 Fixed docker version
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 17:01:58 -08:00
French Ben
8d0197d403 Added bundle detection
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 16:19:29 -08:00
French Ben
a76ddbc51d Removed extra line
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 15:45:15 -08:00
French Ben
efde709ed5 Removed unneeded var
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 14:26:44 -08:00
French Ben
6752ad5511 Flexible docker version
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 14:25:43 -08:00
French Ben
10bd1e526d 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
b2b585ac99 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
a118ce4f05 Added quotes for curling
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-23 15:15:28 -08:00
Justin Cormack
457c173849 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
447ee3b6c0 Merge pull request #1202 from justincormack/go-up
Update to Go 1.8
2017-02-17 09:19:53 -08:00
Justin Cormack
fe64819020 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
844c1c39df 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
bece837dec 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
56059aba3b 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
084291469c 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
97b5b71224 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
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