Add image layer on windows
The docker-compose files were trying to use volume sharing, which is not supported on Windows in conjunction with docker-machine. Hence create a separate layer on Windows, which copies the configuration files to the target. Change-Id: Ifeacc56198ffc8fb2eb31c14ab91334e22e916f5 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
parent
e6d9617c79
commit
0c404fd6f3
11
tests/testserver/Dockerfile
Normal file
11
tests/testserver/Dockerfile
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# This Dockerfile is used on windows as volume sharing / mounting does not work in conjunction
|
||||||
|
# docker-machine. Windows Update 1809 might solve some of those issues when using docker0
|
||||||
|
# network switch, but nothing has been reported in regards to the combination with docker-machine.
|
||||||
|
|
||||||
|
ARG provisioningImage
|
||||||
|
FROM $provisioningImage
|
||||||
|
|
||||||
|
# Common is used for all test images so far, no need for a variable
|
||||||
|
COPY ./common /common
|
||||||
|
ARG servicedir
|
||||||
|
COPY $servicedir /service
|
@ -12,12 +12,13 @@ version: '3.4'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
apache2:
|
apache2:
|
||||||
image: qt-test-server-apache2:537fe302f61851d1663f41495230d8e3554a4a13
|
|
||||||
container_name: qt-test-server-apache2
|
container_name: qt-test-server-apache2
|
||||||
domainname: ${TEST_DOMAIN}
|
domainname: ${TEST_DOMAIN}
|
||||||
volumes:
|
build:
|
||||||
- ./common:/common:ro
|
context: .
|
||||||
- ./apache2:/service:ro
|
args:
|
||||||
|
provisioningImage: qt-test-server-apache2:537fe302f61851d1663f41495230d8e3554a4a13
|
||||||
|
servicedir: ./apache2
|
||||||
entrypoint: common/startup.sh
|
entrypoint: common/startup.sh
|
||||||
command: [common/ssl.sh, service/apache2.sh]
|
command: [common/ssl.sh, service/apache2.sh]
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
@ -28,14 +29,15 @@ services:
|
|||||||
- test_cert="qt-test-server-host-network-cacert.pem"
|
- test_cert="qt-test-server-host-network-cacert.pem"
|
||||||
|
|
||||||
squid:
|
squid:
|
||||||
image: qt-test-server-squid:9c32f41b19aca3d778733c4d8fb0ecc5955e893c
|
|
||||||
container_name: qt-test-server-squid
|
container_name: qt-test-server-squid
|
||||||
domainname: ${TEST_DOMAIN}
|
domainname: ${TEST_DOMAIN}
|
||||||
depends_on:
|
depends_on:
|
||||||
- apache2
|
- apache2
|
||||||
volumes:
|
build:
|
||||||
- ./common:/common:ro
|
context: .
|
||||||
- ./squid:/service:ro
|
args:
|
||||||
|
provisioningImage: qt-test-server-squid:9c32f41b19aca3d778733c4d8fb0ecc5955e893c
|
||||||
|
servicedir: ./squid
|
||||||
entrypoint: common/startup.sh
|
entrypoint: common/startup.sh
|
||||||
command: service/squid.sh
|
command: service/squid.sh
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
@ -45,12 +47,13 @@ services:
|
|||||||
- test_domain=${TEST_DOMAIN}
|
- test_domain=${TEST_DOMAIN}
|
||||||
|
|
||||||
vsftpd:
|
vsftpd:
|
||||||
image: qt-test-server-vsftpd:f3a9c8d793a77cc007c0e4e481bec01f9e3eeb7e
|
|
||||||
container_name: qt-test-server-vsftpd
|
container_name: qt-test-server-vsftpd
|
||||||
domainname: ${TEST_DOMAIN}
|
domainname: ${TEST_DOMAIN}
|
||||||
volumes:
|
build:
|
||||||
- ./common:/common:ro
|
context: .
|
||||||
- ./vsftpd:/service:ro
|
args:
|
||||||
|
provisioningImage: qt-test-server-vsftpd:f3a9c8d793a77cc007c0e4e481bec01f9e3eeb7e
|
||||||
|
servicedir: ./vsftpd
|
||||||
entrypoint: common/startup.sh
|
entrypoint: common/startup.sh
|
||||||
command: service/vsftpd.sh
|
command: service/vsftpd.sh
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
@ -60,14 +63,15 @@ services:
|
|||||||
- test_domain=${TEST_DOMAIN}
|
- test_domain=${TEST_DOMAIN}
|
||||||
|
|
||||||
ftp-proxy:
|
ftp-proxy:
|
||||||
image: qt-test-server-ftp-proxy:d7de8b28392d173db512a558ccc84ead8bece2ae
|
|
||||||
container_name: qt-test-server-ftp-proxy
|
container_name: qt-test-server-ftp-proxy
|
||||||
domainname: ${TEST_DOMAIN}
|
domainname: ${TEST_DOMAIN}
|
||||||
depends_on:
|
depends_on:
|
||||||
- vsftpd
|
- vsftpd
|
||||||
volumes:
|
build:
|
||||||
- ./common:/common:ro
|
context: .
|
||||||
- ./ftp-proxy:/service:ro
|
args:
|
||||||
|
provisioningImage: qt-test-server-ftp-proxy:d7de8b28392d173db512a558ccc84ead8bece2ae
|
||||||
|
servicedir: ./ftp-proxy
|
||||||
entrypoint: common/startup.sh
|
entrypoint: common/startup.sh
|
||||||
command: service/ftp-proxy.sh
|
command: service/ftp-proxy.sh
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
@ -77,16 +81,17 @@ services:
|
|||||||
- test_domain=${TEST_DOMAIN}
|
- test_domain=${TEST_DOMAIN}
|
||||||
|
|
||||||
danted:
|
danted:
|
||||||
image: qt-test-server-danted:35607f9b790524cf9690c7d12a9a401696b7b6b5
|
|
||||||
container_name: qt-test-server-danted
|
container_name: qt-test-server-danted
|
||||||
domainname: ${TEST_DOMAIN}
|
domainname: ${TEST_DOMAIN}
|
||||||
depends_on:
|
depends_on:
|
||||||
- apache2
|
- apache2
|
||||||
- vsftpd
|
- vsftpd
|
||||||
- ftp-proxy
|
- ftp-proxy
|
||||||
volumes:
|
build:
|
||||||
- ./common:/common:ro
|
context: .
|
||||||
- ./danted:/service:ro
|
args:
|
||||||
|
provisioningImage: qt-test-server-danted:35607f9b790524cf9690c7d12a9a401696b7b6b5
|
||||||
|
servicedir: ./danted
|
||||||
entrypoint: common/startup.sh
|
entrypoint: common/startup.sh
|
||||||
command: service/danted.sh
|
command: service/danted.sh
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user