Commit Graph

1386 Commits

Author SHA1 Message Date
Justin Cormack
4d5e1ae4f2 Merge pull request #496 from kencochrane/pass_docker_url
Add ability to pass url to docker binaries
2016-09-12 15:58:38 +01:00
Ken Cochrane
e3082bcf2a
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
0d0818b85f Merge pull request #487 from justincormack/moretests
add a test for a network service
2016-09-10 15:03:26 +01:00
Justin Cormack
676f1e372f Merge pull request #489 from justincormack/go-repro
Include the Go binary in the hash of the go build base
2016-09-09 17:08:39 +01:00
Justin Cormack
301e633ad3 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
7ca1dc5e1b 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
e4efe4a12d 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
4e43053ce7 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
643d87eae8 Merge pull request #484 from justincormack/testlog
log what we are doing in tests, and split pull and run
2016-09-08 17:34:11 +01:00
Justin Cormack
7a7418faf3 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
b12406f1ab 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
971fa5ce10 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
9b5cb8d02b 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
573cd4d3f6 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
4d2671b606 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
Justin Cormack
bb365313f5 Merge pull request #478 from simonferquel/efi-iso-fix
Fix the source of the generate iso for efi version of moby
2016-09-08 13:51:27 +01:00
Simon Ferquel
7ee35f36cb 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
d7b4675962 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
d7e4a92151 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
d4607a1bdf Merge pull request #476 from justincormack/linux-4.4.20
Update kernel and aufs
2016-09-07 23:17:15 +01:00
Justin Cormack
21a0c10707 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
34c8ca5fb7 Merge pull request #475 from justincormack/novolume
Reduce number of volume mounts used in build
2016-09-07 01:00:04 +01:00
Justin Cormack
7b2d8ff227 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
35acfcb3f5 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
106739fa02 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
19ca61b8d2 Merge pull request #473 from justincormack/nodev
Do not create default devices
2016-09-06 23:58:14 +01:00
Justin Cormack
6268a1ace0 Merge pull request #468 from justincormack/alpine-iso
Use alpine to build bios
2016-09-06 23:57:49 +01:00
Justin Cormack
45ece4e9b8 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
bf3751d80c Merge pull request #466 from justincormack/more-repro
[WIP] closer to reproducible builds
2016-09-06 13:20:51 +01:00
Justin Cormack
3a2c28f352 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
9e149a245f Merge pull request #471 from justincormack/less-context
Faster build via less context sent
2016-09-06 09:53:09 +01:00
Justin Cormack
5fe4445c88 Faster build via less context sent
See #470. Still more to do.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-06 09:45:37 +01:00
Justin Cormack
feb141d324 fix iso build
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-06 00:11:48 +01:00
Justin Cormack
3b46f9fcbe Use alpine to build bios
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-05 23:58:12 +01:00
Justin Cormack
e71638ce1f 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
28d6e1717f more specific golang alpine base package
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-05 15:05:52 +01:00
Justin Cormack
5b43cf266f Merge pull request #438 from nathanleclaire/diagnosticserverrace
Fix race condition(s) in command collection code
2016-09-03 09:57:05 +01:00
Nathan LeClaire
173765ffce Use additional parent (global) context
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-09-02 16:45:05 -07:00
Nathan LeClaire
d2ff4a06ff 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
d297c3b88d Merge pull request #463 from justincormack/nodockerarm
remove old arm docker binary, now releases are available upstream
2016-09-02 16:54:05 +01:00
Justin Cormack
97ef6ccf2a 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
089eaf3306 Merge pull request #462 from justincormack/diagnosticsfix
diagnostics program fix up output
2016-09-02 16:31:43 +01:00
Justin Cormack
98e5532237 diagnostics program fix up output
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-02 16:30:37 +01:00
Justin Cormack
058f894190 Merge pull request #460 from djs55/iptables-syslog
Make the iptables wrapper use syslog
2016-09-01 11:49:30 +01:00
David Scott
2911fb6fe1 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
cd052f1fe0 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
0f1298e336 Merge pull request #458 from justincormack/cron
run crond for log rotation
2016-08-31 19:14:27 +01:00
Justin Cormack
19a90cbd71 run crond for log rotation
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 19:08:56 +01:00
Justin Cormack
c32627a296 Merge pull request #456 from justincormack/nodtb
remove arm dtb now we no longer build arm kernel
2016-08-31 18:56:54 +01:00
Justin Cormack
2848c13ed7 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