Commit Graph

656 Commits

Author SHA1 Message Date
Justin Cormack
5f4d354b10 Update to docker 1.12.3-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-25 10:06:52 +01:00
Justin Cormack
3208cca326 go fmt
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-21 15:35:10 +01:00
Justin Cormack
2409adfe0a update C build base images for Musl update
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-20 13:23:12 +01:00
Justin Cormack
d435d5115b Update to Go 1.7.3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-20 13:17:16 +01:00
Justin Cormack
5186302b65 Merge pull request #614 from justincormack/git-go
Add git to Go build package
2016-10-17 09:49:52 +01:00
Justin Cormack
db0376cb88 add git to Go build package
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-16 13:49:28 +01:00
Justin Cormack
d48e655cdd remove temporary force curl before hub updated
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-14 21:58:30 +01:00
Justin Cormack
3cead2d813 Increase default memlock ulimit
Fix #610

Users can override, but the default is low.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-14 11:27:45 +01:00
Justin Cormack
11125429f3 Default to overlay2
If there is no storage-driver set in daemon.json and no
aufs directory in the docker directory, use overlay2 as the storage
driver.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-13 16:08:20 +01:00
Justin Cormack
fa268fbdf3 temporarily force curl as image not yet available
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-12 00:48:18 +01:00
Justin Cormack
9b0f64044a Update Docker to 1.12.2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-11 19:26:45 +01:00
Justin Cormack
2e67fa91b7 Make the Docker download more robust to pipefail errors
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-11 19:26:45 +01:00
Justin Cormack
cfbdc7d067 do not remove build containers
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-11 16:12:40 +01:00
Justin Cormack
5f74483a32 Sort block devices
See #589 for discussion.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-10 15:09:54 +01:00
Justin Cormack
1b529e5763 Merge pull request #589 from nathanleclaire/azure_recent_fixes
Fixes for Azure hostname and swap disk
2016-10-10 15:08:30 +01:00
Justin Cormack
0ac6beff82 Do not create latest tags for base images
As we never use these, do not create them.

Also update images where applicable.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-10 14:55:48 +01:00
Justin Cormack
cbf40afd8b Update docker to 1.12.2-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-08 13:00:15 +02:00
Nathan LeClaire
962f8a4ac9 Fixes for Azure hostname and swap disk
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-10-06 14:40:11 -07:00
Justin Cormack
e1454f0249 add ncurses to C build for menuconfig
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-01 18:26:38 +01:00
Justin Cormack
fa19d3259b Use build container id rather than tagging builds
This means that multiple builds will not conflict, so we can
remove the lock from the CI. Also quieter when no errors.

Some still left to do, only done the ones used in build and CI
initially. Some of the others will be cleaned up anyway later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-29 20:21:17 +01:00
Justin Cormack
0214c41ff3 Use patched aufs-utils so can compile kernel with alpine
This is going to be submitted upstream.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-29 16:17:46 +01:00
Justin Cormack
35b58b9290 update Docker to 1.12.2-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-28 08:51:07 +01:00
Justin Cormack
0d08098b09 Fix code for downloading Docker for release candidates
These always need to be downloaded with curl.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-27 22:26:29 +01:00
Justin Cormack
ce6ae3a70b fix checking for debug key exists
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-26 22:24:48 +01:00
Justin Cormack
9051236f4d Fix dhcp ntp on osx
1. Upstream issue in Alpine that default directory is not used.
2. dhcp appends ntp servers, so delete default first.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-26 21:39:20 +01:00
Justin Cormack
ff57ad7789 Merge pull request #531 from rneugeba/hvtools-out
remove special hack hvtools
2016-09-24 14:29:55 +01:00
Justin Cormack
69beeca467 Copy docker-init if present
Fix #552

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-23 18:11:05 +01:00
Justin Cormack
07103e7e62 Switch to dhcpcd
Should fix issue with not sending hostname which Azure needs.

This should be requesting all the dhcp features we currently use.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-23 15:52:30 +01:00
Rolf Neugebauer
c9594c5a02 packages: remove hvtools
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-23 11:03:40 +01:00
Justin Cormack
041da8cf1b Merge pull request #546 from rneugeba/if-clean
Clean up network interface
2016-09-23 10:41:15 +01:00
Rolf Neugebauer
803be36b96 net: consolidate DHCP onto eth0 only
- rename DfW main interface eth0
- remove eth1 DHCP config
- create tap device in init script not interfaces file

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-22 18:12:45 +01:00
Justin Cormack
cac5f969a1 Do not fail if disk is partitioned but has no swap
Fix #543

Also clean up quoting and unused parts a little.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-22 16:30:28 +01:00
Rolf Neugebauer
b5e38ce811 net: rename Hyper-V internal network to hvint0 and configure it
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-22 16:17:26 +01:00
Rolf Neugebauer
e2e123e464 tap-vsockd: better error handling
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
839a65c0bd 9pmount: Don't init variables if they are unconditionally assigned later
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
3c30271f3c transfused: Use Linux coding style (mostly)
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
1a289d04e5 tap-vsockd: Use Linux coding style (mostly)
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Rolf Neugebauer
6df7fae1a9 9pmount: Use Linux coding style (mostly)
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-09-16 11:02:29 +01:00
Justin Cormack
4a4a40f1df add random-seed database key
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-15 13:16:51 +01:00
Justin Cormack
7c9e05ff46 run tests with only alpine image, not nginx to make faster
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-13 23:21:44 +01:00
Justin Cormack
9a96f5da8c Add support for running a development bundle of Docker
Add a database key `bundle` that contains a path to a Docker dev
bundle eg `/.../docker/bundles/1.13.0-dev` where the docker
binaries to run can be found. This will be paired with a script
in `docker/docker` to set this key, so users can easily help
contribute to Docker development.

The change will be permanent until the key is removed or a factory
reset is done, or the bundle cannot be found.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-13 22:46:27 +01:00
Justin Cormack
5e4e7d1c7f rm docker container used for binary extraction
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:37:24 +01:00
Justin Cormack
206dfe0950 simplify vendor tar
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:36:01 +01:00
Justin Cormack
cd6507f1d0 for release docker binaries we can fetch from docker hub rather than curl, so will be cached
Allow override in case docker images not released

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:36:01 +01:00
Justin Cormack
43ab6520cf update to latest alpine base images
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:02:07 +01:00
Justin Cormack
b392bf0a2e Simplify kernel output and main Dockerfile
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:02:07 +01:00
Justin Cormack
5c634808df simplify tar for vendor directory
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:02:07 +01:00
Justin Cormack
1b487549bb use tar for iptables
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:02:07 +01:00
Justin Cormack
276157a769 Move all output to the directories it will be in eventually
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:02:07 +01:00
Justin Cormack
5ae109fc23 build packages in parallel
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00