summaryrefslogtreecommitdiffstats
path: root/tests/testserver/ftp-proxy
diff options
context:
space:
mode:
authorRyan Chu <ryan.chu@qt.io>2018-11-27 22:04:02 +0100
committerRyan Chu <ryan.chu@qt.io>2019-01-23 15:28:45 +0000
commitbeab266977c858950bfaa5c2c0d624cb6730f1bc (patch)
tree2f04a4555a9a32b1877e5d44b058a6939d7ecd76 /tests/testserver/ftp-proxy
parent4552eddabffc43846c9dcbb10f201770fe5df019 (diff)
Docker-based test servers for network-related Qt autotests on Windows
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 <jedrzej.nowacki@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/testserver/ftp-proxy')
-rw-r--r--tests/testserver/ftp-proxy/.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/testserver/ftp-proxy/.gitattributes b/tests/testserver/ftp-proxy/.gitattributes
new file mode 100644
index 0000000000..21f6efbe14
--- /dev/null
+++ b/tests/testserver/ftp-proxy/.gitattributes
@@ -0,0 +1,2 @@
+*.sh text eol=lf
+*.conf text eol=lf