Commit Graph

2268 Commits

Author SHA1 Message Date
Robb Kistler
2fa112b1b7 Delegated make targets should be phony targets
Make won't evaluate actual dependencies of targets called with
`$(MAKE) -C` if the target file already exists.  Marking the
top-level targets `.PHONY` will enable incremental builds.

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-02-28 10:18:50 -08:00
Riyaz Faizullabhoy
d445716406 Merge pull request #1220 from riyazdf/fix-media
Fix alpine/mobylinux-efi.iso target
2017-02-28 10:10:48 -08:00
Riyaz Faizullabhoy
e24c8098ff kernel: Update kernel to 4.9.13 and 4.4.52
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-28 08:11:07 -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
Riyaz Faizullabhoy
945f826c8b Fix alpine/mobylinux-efi.iso target
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-27 16:18:37 -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
Riyaz Faizullabhoy
52181f7905 Merge pull request #1219 from rneugeba/kernup
Update kernel to 4.9.12 and 4.4.51
2017-02-27 14:16:37 -08:00
Justin Cormack
78a11701c9 Merge pull request #1216 from RobbKistler/engine-from-s3
Allow docker engine to be pulled from s3 bucket
2017-02-27 14:12:43 -08:00
Rolf Neugebauer
e3502065d9 kernel: Update kernel to 4.4.51
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-02-27 13:55:53 -08:00
Rolf Neugebauer
90895783c0 kernel: Update kernel to 4.9.12
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-02-27 13:49:47 -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
Riyaz Faizullabhoy
51642e8abb Merge pull request #1215 from FrenchBen/fix-url
Added quotes for curling
2017-02-23 15:34:42 -08:00
Justin Cormack
01ef722f8b Merge pull request #1214 from rneugeba/multi
scripts: Add script to run a hyperkit with moby on the DfM network
2017-02-23 15:17:52 -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
Rolf Neugebauer
2a7972e0b3 scripts: Add script to run a hyperkit with moby on the DfM network
This requires a VPNKit which includes https://github.com/docker/vpnkit/pull/188

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-02-23 11:26:49 -08:00
Justin Cormack
6aa1da8baf Merge pull request #1211 from justincormack/make-tag
Add a CI tag Makefile target
2017-02-21 11:00:51 +00:00
Justin Cormack
7fdb89d22f Add a CI tag Makefile target
The CI will set `CI_TAG` to the tag name, which will be used for the
uploaded images instead of the git commit ID.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-21 10:36:25 +00:00
Justin Cormack
ddafc8c871 Merge pull request #1208 from justincormack/mobytool
Rough first version of the moby tool
2017-02-21 10:22:04 +00:00
Justin Cormack
4797088ec0 Rough first version of the moby tool
- terrible code
- lots needs changing
- can build a Moby from a config yaml that boots

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-20 21:44:23 +00:00
Justin Cormack
a5cbe08155 Merge pull request #1207 from justincormack/kernel-image-for-mobytool
Change kernel upload for new tooling
2017-02-20 21:41:52 +00:00
Justin Cormack
f4a112dc21 Change kernel upload for new tooling
The mobylinux/kernel image now has the bzImage (no longer named vmlinuz64)
and a tarball of the files needed for the initrd, ie modules etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-20 15:54:02 +00:00
Justin Cormack
372a463976 Merge pull request #1206 from justincormack/kernelup
Kernel 4.9.11, 4.4.50 and AUFS update
2017-02-20 13:54:25 +00:00
Justin Cormack
5af24d0d8f Kernel 4.9.11, 4.4.50 and AUFS update
Security update, importance low.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-20 12:15:39 +00:00
Justin Cormack
c1449d4e35 Merge pull request #1205 from justincormack/docker-17.03-rc
Update Docker to 17.03.0-ce-rc1
2017-02-20 11:48:54 +00: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
e1eab7ca4f Merge pull request #1203 from justincormack/kernel-make-clean
Clean up kernel Makefile so it has no repetition
2017-02-17 11:10:21 -08:00
Justin Cormack
c6cfa0e4d3 Clean up kernel Makefile so it has no repetition
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 17:43:35 +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
Riyaz Faizullabhoy
c643f19434 Merge pull request #1197 from justincormack/testup
Update kernel config tests
2017-02-17 09:19:44 -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
74111017f6 Merge pull request #1201 from justincormack/newtools
Add new minimal init prototype and new tools
2017-02-17 15:56:42 +00:00
Justin Cormack
d29be01b0d Add new minimal init prototype and new tools
This is part of the new moby tool work to get a minimal system
up that can be expanded.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 15:31:00 +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
295f352bf2 Merge pull request #1199 from ijc25/cpuacct-online-offline
Revert "sched/cpuacct: Show all possible CPUs in cpuacct output" in 4.9 kernel
2017-02-17 13:43:15 +00:00
Ian Campbell
31cf45bfc3 Revert "sched/cpuacct: Show all possible CPUs in cpuacct output" in 4.9 kernel
This change (5ca3726 added in v4.7-rc1) exposed issues described in
https://github.com/docker/docker/issues/28941, since we don't support CPU
hotplug anyway revert the change while we decide on a proper fix.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-02-17 13:19:18 +00:00
Justin Cormack
85613b5431 Merge pull request #1193 from justincormack/kernelup
Update Linux 4.4 to 4.4.49
2017-02-16 09:40:30 +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
Justin Cormack
10df2f9857 Merge pull request #1192 from RobbKistler/1139-fix-disk-race
Re-run `mdev -s` if /dev/sda1 isn't populated
2017-02-16 08:49:49 +00:00
Justin Cormack
0b5cad4f14 Update Linux 4.4 to 4.4.49
Security update, low importance.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-16 08:47:52 +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
Rolf Neugebauer
23306101cb Merge pull request #1189 from rneugeba/kern-up
kernel: Update to 4.9.10
2017-02-15 17:50:10 +00:00
Rolf Neugebauer
6396ecdeee kernel: Update to 4.9.10
4.9.10 included several of the VMBus patches we no longer
need to carry.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-02-15 16:50:31 +00:00
Justin Cormack
d17e5f69a2 Merge pull request #1187 from justincormack/pool
Use ntp pool not single server for AWS
2017-02-14 17:50:06 +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
Justin Cormack
304fb1bc27 Merge pull request #1175 from riyazdf/kern-config-hardening
Kernel config hardening
2017-02-13 20:09:55 +00:00