From beab266977c858950bfaa5c2c0d624cb6730f1bc Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Tue, 27 Nov 2018 22:04:02 +0100 Subject: Docker-based test servers for network-related Qt autotests on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no docker bridge on Windows. Docker document recommends using port mapping to connect to a container. The problem is that it causes a port conflict if the user is running a service that binds the same port on the host. This change applies the same solution of macOS to deploy the docker environment into VirtualBox and use the host network option. Task-number: QTQAINFRA-2294 Change-Id: Iedcb8daa39373f02adb59f02eae2775f02870c54 Reviewed-by: Jędrzej Nowacki Reviewed-by: Edward Welbourne --- tests/testserver/danted/.gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tests/testserver/danted/.gitattributes (limited to 'tests/testserver/danted/.gitattributes') diff --git a/tests/testserver/danted/.gitattributes b/tests/testserver/danted/.gitattributes new file mode 100644 index 0000000000..21f6efbe14 --- /dev/null +++ b/tests/testserver/danted/.gitattributes @@ -0,0 +1,2 @@ +*.sh text eol=lf +*.conf text eol=lf -- cgit v1.2.3