Justin Cormack
43dbfe0ce7
Merge pull request #332 from justincormack/quietdb
...
only try to mount db for desktop editions
2016-07-22 10:53:40 +01:00
Justin Cormack
be68e3330a
Merge pull request #324 from ncopa/alpine-gummiboot
...
Use upstream gummiboot binary and build EFI with alpine
2016-07-22 10:52:38 +01:00
Justin Cormack
45edded90e
allow for args for servers in diagnostics
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-21 18:38:38 +01:00
Justin Cormack
85726ee406
only try to mount db for desktop editions
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-21 18:37:34 +01:00
Justin Cormack
9ada58e5aa
Merge pull request #331 from justincormack/fixdiag
...
fix typo
2016-07-21 17:35:37 +01:00
Justin Cormack
c5b2246168
fix typo
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-21 17:35:11 +01:00
Justin Cormack
9117486b3f
default to unknown platform if not specified in command line
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-21 17:25:48 +01:00
Justin Cormack
c97a22116c
Tweak disk detection diagnostics to match what is going on better
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-21 15:48:24 +01:00
Natanael Copa
e8174e34b5
Use upstream gummiboot binary and build EFI with alpine
...
Alpine 3.4 got gummiboot backported so we use that to build the EFI.
Signed-off-by: Natanael Copa <natanael.copa@docker.com >
2016-07-21 14:42:05 +02:00
Justin Cormack
68435c64ba
Clean up sources that arm edition will not need
...
As arm will not be a desktop edition, we will not need to
try to fix these. We do need `diagnostics` though, the
vsock code however is not cross building, needs to be fixed
or made conditional.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-21 13:39:03 +01:00
Rolf Neugebauer
2e54a4d295
Merge pull request #309 from justincormack/tapvsockvmbus
...
Use mobyplatform not vmbus for tap-vsock
2016-07-21 10:34:57 +01:00
Justin Cormack
18a8b4faaa
Merge pull request #313 from justincormack/hvtools-vmbus
...
Use platform to decide whether to run hv tools
2016-07-21 09:53:18 +01:00
Justin Cormack
fb6aeacf7c
Merge pull request #312 from justincormack/vsuddvmbus
...
Use platform name not vmbus
2016-07-21 09:52:48 +01:00
Justin Cormack
48e4100e2f
Merge pull request #306 from justincormack/chronyconfig
...
Fix up chronyd support for editions
2016-07-21 00:45:27 +01:00
Nathan LeClaire
cf0fc1f75b
Remove unused file
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-07-20 13:48:52 -07:00
Nathan LeClaire
a9ced0a205
Fix error in diagnostic server init code
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-07-20 13:48:21 -07:00
David Sheets
f61be6860b
finish removal of llmnrd from #311
...
Signed-off-by: David Sheets <dsheets@docker.com >
2016-07-20 17:03:51 +01:00
Justin Cormack
345be9e5d4
Use platform to decide whether to run hv tools
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 14:48:16 +01:00
Justin Cormack
7f1595d11b
Use platform name not vmbus
...
See #301
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 14:44:43 +01:00
Justin Cormack
bbf4def475
Remove llmnrd
...
Not really required as ports exposed on localhost. If users
want to connext to VM ports they can use the IP address, as
this is discouraged. llmnr names are very slow to access,
so not nice to use.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 14:32:14 +01:00
Justin Cormack
b4bba1fd65
Merge pull request #310 from justincormack/posixlyequal
...
Posixly correct = not ==
2016-07-20 14:20:52 +01:00
Justin Cormack
3c8c48f459
Posixly correct = not ==
...
See #161 #170 should be covered...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 12:33:01 +01:00
Justin Cormack
a880bcf136
Use mobyplatform not vmbus for tap-vsock
...
Plus cleanup for less indentation. No functional change.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 12:30:59 +01:00
Rolf Neugebauer
13d92bd082
Merge pull request #308 from justincormack/transfusedvmbus
...
Only run transfused on mac platform
2016-07-20 12:21:18 +01:00
Justin Cormack
db7bc9cb8c
Only run transfused on mac platform
...
See #301
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 12:11:39 +01:00
Justin Cormack
3601348fef
use platform not vmbus consistently
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 12:07:40 +01:00
Justin Cormack
4202e575c0
Fix up chronyd support for editions
...
See #305 #301
This sets AWS to use the amazon ntp pool, windows to do nothing,
mac uses ntp it gets from DNS. Azure currently uses default pool,
this probably needs fixing.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 12:02:59 +01:00
Justin Cormack
878c3ab3af
Remove rawtcp from diagnostics server
...
See https://github.com/docker/moby/pull/303
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-20 11:46:54 +01:00
Nathan LeClaire
0de5faabc7
Re-write diagnostic server to support cloud/HTTP
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-07-19 17:40:15 -07:00
Justin Cormack
85ee976d0d
Merge pull request #284 from nathanleclaire/azure
...
Add support for Azure (VHD) build to Moby
2016-07-19 22:44:01 +01:00
Justin Cormack
3cd4f80032
Remove dnsfix
...
This was there to workaround an issue with vmnet, not applicable now.
A user reported that they were getting unexpected 8.8.8.8 addresses
and it could possible be applied erroneously under some circumstances.
Signed-off-by: Justin Cormack <justin@specialbusservice.com >
2016-07-19 10:04:09 +01:00
Nathan LeClaire
329476944a
Add Azure provider support
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-07-18 16:22:21 -07:00
Nathan LeClaire
aaa6cc05e7
Add AWS build support
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-07-18 11:08:44 -07:00
Justin Cormack
3d3b67d0c3
Add conditional services based on mobyplatform
...
Replaces https://github.com/docker/moby/pull/282
Use mobyplatform=xxx to specify platform in boot command
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-18 12:39:14 +01:00
Justin Cormack
ceafadb6a4
capture containerd logs
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-15 15:11:06 +01:00
Justin Cormack
5b0d4acfdc
wait for system containerd to start
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-15 11:38:05 +01:00
Justin Cormack
5b7ff1f6ef
Wait for docker to finish starting up before terminateing init script
...
This means dependent services can rely on docker being up.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-15 11:29:32 +01:00
Justin Cormack
cd18b353a3
Merge pull request #281 from justincormack/containerd
...
Add a system containerd
2016-07-14 12:32:07 +01:00
Justin Cormack
0ec195786a
Add a system containerd
...
This adds an independent system containerd for running internal
containers.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-14 12:28:44 +01:00
Justin Cormack
9dad6b6467
set nofile ulimit to maximum possible value
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-13 14:04:49 +01:00
Justin Cormack
72861a6c88
update to 1.12.0-rc4 upstream version
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-07-13 09:50:25 +01:00
Rolf Neugebauer
0aee0c0ed5
diagnostics: Don't check for transfused on Windows
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2016-07-12 14:28:11 +01:00
Rolf Neugebauer
f8c53db413
init: don't start docker on 0.0.0.0:2375 on DfM/DfW
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2016-07-12 14:08:55 +01:00
Rolf Neugebauer
6c95bff567
init: don't start transfused on Windows
...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2016-07-12 14:04:08 +01:00
David Scott
4f205ed9b2
iptables: log to /var/log/... rather than /var/run/log
...
Signed-off-by: David Scott <dave.scott@docker.com >
2016-07-12 10:26:42 +01:00
David Scott
f6a85c0592
iptables: only open host ports if native/port-forwarding=true in the db
...
Signed-off-by: David Scott <dave.scott@docker.com >
2016-07-12 10:26:42 +01:00
David Scott
9762094fbb
iptables: add a TODO
...
Signed-off-by: David Scott <dave.scott@docker.com >
2016-07-12 10:26:42 +01:00
David Scott
b6fb908ae5
iptables: remove the pid file after sending SIGTERM
...
Signed-off-by: David Scott <dave.scott@docker.com >
2016-07-12 10:26:42 +01:00
David Scott
9e441356b5
proxy: add a -no-local-ip option
...
docker itself seems to bind to the port globally inside Moby, so we
get an EADDRINUSE if we try to do it too.
Signed-off-by: David Scott <dave.scott@docker.com >
2016-07-12 10:26:42 +01:00
David Scott
5726f2b2c3
iptables: get the kill arguments the right way round
...
Signed-off-by: David Scott <dave.scott@docker.com >
2016-07-12 10:26:42 +01:00