summaryrefslogtreecommitdiffstats
path: root/tests/testserver/docker-compose.yml
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2019-02-12 17:05:51 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2019-02-28 15:48:31 +0000
commita247d08faef289dcaab2c7132189e3cf051d27fb (patch)
tree973cd2cc81cd918b8f03b1097a889f051e7ede17 /tests/testserver/docker-compose.yml
parent1844f011f67a767d163d16d5338ad24ade7eb0c1 (diff)
Port tst_qtcpsocket to the docker server
The iptables container launches with extra capabilities to actually be able to make changes to the tables. Change-Id: I892fd18853ce882709e21791e6c88217e5029d53 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests/testserver/docker-compose.yml')
-rw-r--r--tests/testserver/docker-compose.yml17
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/testserver/docker-compose.yml b/tests/testserver/docker-compose.yml
index fe39a49cca..4286c88211 100644
--- a/tests/testserver/docker-compose.yml
+++ b/tests/testserver/docker-compose.yml
@@ -31,6 +31,9 @@ services:
- apache2
external_links:
- apache2:apache2.${TEST_DOMAIN}
+ - cyrus:cyrus.${TEST_DOMAIN}
+ - iptables:iptables.${TEST_DOMAIN}
+ - vsftpd:vsftpd.${TEST_DOMAIN}
volumes:
- ./common:/common:ro
- ./squid:/service:ro
@@ -93,3 +96,17 @@ services:
- ./cyrus:/service:ro
entrypoint: common/startup.sh
command: service/cyrus.sh
+
+ iptables:
+ image: qt-test-server-iptables:cb7a8bd6d28602085a88c8ced7d67e28e75781e2
+ container_name: qt-test-server-iptables
+ domainname: ${TEST_DOMAIN}
+ hostname: iptables
+ volumes:
+ - ./common:/common:ro
+ - ./iptables:/service:ro
+ entrypoint: common/startup.sh
+ command: service/iptables.sh
+ cap_add:
+ - NET_ADMIN
+ - NET_RAW