Commit Graph

640 Commits

Author SHA1 Message Date
Nathan LeClaire
7f822ee8b3 Remove now incompatible Swarm init logic
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-27 10:34:57 -07:00
Justin Cormack
7b75a2d741 Enable swarm mode in test suite
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 16:20:29 +01:00
Justin Cormack
6973159dce On desktop editions, set default swarm advertise address to eth0
This allows plain `swarm init` to work. We do not support multi
node clusters yet as there is no way to reqach this address from
externally at present.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 16:10:20 +01:00
Justin Cormack
54f6dcc44e Update Docker to 1.12.0-rc5
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 13:23:29 +01:00
Justin Cormack
b17a1b7366 Support make flags for Docker version and experimental
Use `make DOCKER_VERSION=xxx` to override version. Note that
as install process and packaging may vary this may not work.

Use `make DOCKER_EXPERIMENTAL=0` to build from either release
binaries, if version is a final release or test binaries for
release candidates.

Building experimental is still the default.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 13:18:09 +01:00
Justin Cormack
48d09d8dc9 Merge pull request #351 from nathanleclaire/nathanleclaire2docker4xazure
Implement only one container for Azure
2016-07-25 23:42:33 +01:00
Nathan LeClaire
d6f2883730 Implement only one container for Azure
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-25 15:39:04 -07:00
Nathan LeClaire
0aae9b68d6 Continue POSIX-ifying build scripts
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-25 11:14:57 -07:00
Justin Cormack
01a588cb6b Fix up mobyconfig startup code
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-25 14:03:03 +01:00
Justin Cormack
4f5db70e9c fix typo
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-25 12:35:45 +01:00
Justin Cormack
efb5e03004 Merge pull request #343 from justincormack/etchosts
add etc/hosts database key, as requested at Docker London
2016-07-22 14:41:15 +01:00
Justin Cormack
93b72d5cfe add etc/hosts database key, as requested at Docker London
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-22 14:27:20 +01:00
David Sheets
119740435d Merge pull request #340 from dsheets/transfused-notify-channel
transfused notify channel
2016-07-22 13:58:28 +01:00
David Sheets
78cca476fb transfused: copyedit a couple error messages
Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-22 13:40:52 +01:00
David Sheets
ddd0fcc603 transfused: add separate FUSE notify channel to avoid deadlock
This adds a new notify channel to the transfuse protocol. It is not
optional yet but could be made to be optional. A notify protocol and
notify channel are required because writing FUSE response messages to
the FUSE device has different semantics from writing asynchronous
notifications. In particular, response message writes only error on
malformed messages, do not take locks, and do not block. In contrast,
asynchronous notifications can error under normal conditions
(e.g. invalidating a cache entry that doesn't exist), can take locks
during the write call, and can block.

If responses and notifications occur in the same thread, the file system
can become deadlocked when syscalls lock resources waiting for a
response and a notification is written that blocks attempting to acquire
those same locks. The response that would unlock the contended lock
could be queued behind the notification write but the notification write
can't unblock until the response is written in the future. This patch
enables file systems to avoid that fate by offering a secondary channel
on which to send notifications.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-22 13:35:57 +01:00
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