From c746882a07952a0cd460e6fa8bcac246289db6b9 Mon Sep 17 00:00:00 2001 From: Krzysztof Gajewski Date: Mon, 1 Feb 2021 17:46:51 +0100 Subject: Add HTTPS to DFC tests - testing environment preparation for DFC with HTTPS client (expand existing http server) - add suitable TCs for CSIT tests Issue-ID: DCAEGEN2-2528 Signed-off-by: Krzysztof Gajewski Change-Id: Ifa8abb827e269d76144fc74c65031dd387fe5fe7 --- .../http-https-server/docker-compose.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'test/mocks/datafilecollector-testharness/http-https-server/docker-compose.yml') diff --git a/test/mocks/datafilecollector-testharness/http-https-server/docker-compose.yml b/test/mocks/datafilecollector-testharness/http-https-server/docker-compose.yml index 537cfcfaf..09b698f89 100644 --- a/test/mocks/datafilecollector-testharness/http-https-server/docker-compose.yml +++ b/test/mocks/datafilecollector-testharness/http-https-server/docker-compose.yml @@ -2,14 +2,19 @@ version: '3' services: - http-server: - container_name: http-server-httpd + http-https-server: + container_name: http-https-server-httpd image: httpd:alpine + environment: + APACHE_LOG_DIR: /usr/local/apache2/logs ports: - "80:80" + - "443:443" + - "8080:8080" volumes: - - ./configuration/htpasswd:/usr/local/apache2/conf/.htpasswd:ro - - ./configuration/httpd.conf:/usr/local/apache/conf/httpd.conf:ro - - - ./files/onap/http/:/usr/local/apache2/htdocs + - ./apache2/conf/.htpasswd:/usr/local/apache2/conf/.htpasswd:ro + - ./apache2/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf:ro + - ./apache2/conf/extra/httpd-ssl.conf:/usr/local/apache2/conf/extra/httpd-ssl.conf:ro + - ./../certservice/generated-certs/apache-pem:/usr/local/apache2/certs:ro + - ./files/onap/http:/usr/local/apache2/htdocs restart: on-failure -- cgit 1.2.3-korg