Commit Graph

618 Commits

Author SHA1 Message Date
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
Justin Cormack
b75711b4cd clean up transfused build
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
b06a5fa6eb clean up nc-vsock build
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
d4c09bbd92 move include file
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
e42d59045d clean up 9pmount-vsock build
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
c52d04a248 use cc
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
349e98c625 remove unused OS=
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
d2551be515 clean up hvtools build
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
57d1e7e232 clean up tap-vsockd build process
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
98beff2fa0 clean up docker Makefile
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Justin Cormack
cc89e32c03 no longer need OS here
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
d00ed9ce6e run with no network
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
b4d9394f50 clean up vsudd build like proxy
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
7a3dda4995 remove unused include, it is all in the Go code
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
effff65ecd simplify Dockerfile
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
168fdedace clean up diagnostics server build
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
d0c3e873f6 Do not need to use logrus, not using any features of it here.
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
28afc72a97 move vendor directory directly under packages
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
01ad4e5e39 remove arm build code, needs reworking
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
b3804fd8d4 remove obsolete readme
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Justin Cormack
b69893eb6d Clean up proxy Makefile
Model for the others, make sure dependencies are correct and that
only the exactly correct things are passed to Docker. No longer copy
vendor directory.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 15:59:19 +01:00
Ken Cochrane
171f0e9fe5 Add ability to pass url to docker binaries
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
2016-09-12 10:55:09 -04:00
Justin Cormack
8ddf83431d Merge pull request #487 from justincormack/moretests
add a test for a network service
2016-09-10 15:03:26 +01:00
Justin Cormack
089c592873 Include the Go binary in the hash of the go build base
As this is not installed via apk it was not being included in the
checksum.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-09 15:46:23 +01:00
Justin Cormack
1425fe6f4a add a test for a network service
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-09 00:44:40 +01:00
Justin Cormack
78a2742172 Merge pull request #485 from justincormack/dbcap-set-timeout
set a timeout for database capture
2016-09-08 22:18:48 +01:00
Justin Cormack
4e2a2db5c7 set a timeout for database capture
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-08 22:18:04 +01:00
Justin Cormack
c17aa175b6 log what we are doing in tests, and split pull and run
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-08 17:33:35 +01:00
Justin Cormack
7d4ac3f24d Merge pull request #482 from djs55/proxy-bind-soft-failure
proxy: don't fail if the Listen in the VM fails with EADDRNOTAVAIL
2016-09-08 14:34:05 +01:00
Justin Cormack
a2aa615aeb Merge pull request #481 from simonferquel/ca-propagation
Append CA certificates from the host to the global certificate bundle
2016-09-08 14:14:40 +01:00
Simon Ferquel
bb65bd548d Append CA certificates from the host to the global certificate bundle
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2016-09-08 15:03:31 +02:00
Simon Ferquel
6b9a4179e6 Fix an issue with DB values over 4k when 9p database is accessed trough Hyper V
Signed-off-by: Simon Ferquel <simon.ferquel@hotmail.fr>
2016-09-08 14:55:26 +02:00
David Scott
c6757075d0 proxy: don't fail if the Listen in the VM fails with EADDRNOTAVAIL
The purpose of the `slirp-proxy` is to expose ports on the Mac or
Windows host. In d5bd7d690a we added
an additional `Listen` inside the VM for backwards compatibility
with software that expected to be able to listen on `0.0.0.0` in
one container and then access this easily from other containers
using an IP bound to the VM (instead of using a first-class network
to connect the containers or discovering a real IP of the host).

Before this patch we could only expose ports on if the Listen
succeeds on both the host and the VM. In practice this meant that
we could only expose ports on `0.0.0.0` and `127.0.0.1`; attempts
to expose ports on specific interfaces on the host would fail.

This patch treats the EADDRNOTAVAIL error from the Listen inside
the VM as a soft failure, and still attempts to Listen on the host.
If the Listen on the host fails it is still a hard failure.
This allows ports to be exposed on specific IPs used on the host.

Fixes [docker/pinata#5080]

Signed-off-by: David Scott <dave.scott@docker.com>
2016-09-08 13:32:25 +01:00
Justin Cormack
7daf4563e5 Merge pull request #380 from nathanleclaire/diagnostix
[WIP] Add ability for diagnostics to upload to S3 bucket
2016-09-08 09:41:03 +01:00
Justin Cormack
d4b5fc07c9 Closer to reproducible builds
Make an alpine base image for C and Go builds.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-06 13:18:11 +01:00
Justin Cormack
30d4cf9675 more specific golang alpine base package
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-05 15:05:52 +01:00
Nathan LeClaire
0a7634fbd3 Use additional parent (global) context
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-09-02 16:45:05 -07:00
Nathan LeClaire
5d4b7a6f86 Fix race condition(s) in command collection code
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-09-02 16:40:38 -07:00
Justin Cormack
0fe0d2a39b remove old arm docker binary, now releases are available upstream
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-02 16:50:35 +01:00