Commit Graph

1232 Commits

Author SHA1 Message Date
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
Justin Cormack
ce64cf3ef8 Merge pull request #479 from simonferquel/large-config-value-over-hyperv
Fix an issue with DB values over 4k when 9p database is accessed trou…
2016-09-08 14:13:56 +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
Simon Ferquel
12c528c089 Fix the source of the generate iso for efi version of moby
Signed-off-by: Simon Ferquel <simon.ferquel@hotmail.fr>
2016-09-08 14:49:02 +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
30275af07e Update kernel and aufs
- kernel 4.4.20
- aufs 20160905

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-07 22:51:51 +01:00
Justin Cormack
0337f80297 Use docker and cat not compose and volumes for arm
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-07 00:22:21 +01:00
Justin Cormack
5c38729d26 Use docker and cat not compose and volumes for efi, bios
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-07 00:17:29 +01:00
Justin Cormack
f907a57adc Stop using volume and compose to build initrd
This makes remote builds work, and simplifies build.

See #469

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-06 23:59:38 +01:00
Justin Cormack
032ecd86b3 Merge pull request #473 from justincormack/nodev
Do not create default devices
2016-09-06 23:58:14 +01:00
Justin Cormack
ce4561b1cb Merge pull request #468 from justincormack/alpine-iso
Use alpine to build bios
2016-09-06 23:57:49 +01:00
Justin Cormack
6bd1df1675 Do not create default devices
They are created anyway at runtime, and this set is not very complete.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-06 23:08:12 +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
5133c11a27 Use alpine to build bios
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-05 23:58:12 +01:00
Justin Cormack
6ba5c7c8c0 add delete on error to Makefile
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-05 15:10:00 +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
Justin Cormack
bf397574cc diagnostics program fix up output
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-02 16:30:37 +01:00
David Scott
7e58c70929 diagnostics: no need to collect /var/log/service-port-opener.log
This log file has been removed and the contents are now in /var/log/messages
which we already collect.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-09-01 11:28:43 +01:00
David Scott
710cd1aebb iptables wrapper: write to syslog rather than /var/log/service-port-opener.log
This will enable proper log rotation and is simpler.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-09-01 11:28:14 +01:00
Justin Cormack
72a895a03f Merge pull request #458 from justincormack/cron
run crond for log rotation
2016-08-31 19:14:27 +01:00
Justin Cormack
0978a92262 run crond for log rotation
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 19:08:56 +01:00
Justin Cormack
4b4f133620 remove arm dtb now we no longer build arm kernel
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 16:51:03 +01:00
Justin Cormack
07bf4888c1 quieter kernel build
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 15:53:16 +01:00
Justin Cormack
ad7b35e457 Merge pull request #452 from justincormack/nocrosskernel
Remove support for arm kernel build
2016-08-31 15:36:33 +01:00
Justin Cormack
69f290d28f Remove support for arm kernel build
See #449. Plan is to use upstream Alpine kernel for Arm, as
does not need vsock, hvsock or aufs.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 14:23:40 +01:00
David Scott
8f92071848 dhcp: request search domains (DHCP option 119)
Signed-off-by: David Scott <dave.scott@docker.com>
2016-08-31 14:06:55 +01:00
Justin Cormack
b0f3012993 Run dockerd in debug mode if not overridden in config file
Fix #448

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 12:29:23 +01:00
Justin Cormack
15861d87f9 Update Alpine base with DNS search domain config
See #433

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 09:52:01 +01:00
Justin Cormack
80bba73349 Switch to ksyslogd to add log rotation
See #441

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-30 11:37:30 +01:00
Justin Cormack
e03695bfa4 switch to mobylinux hub org
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-30 10:43:50 +01:00