commit b81c681cb6be761a2abb5e2f5af1b923bef1f6b4
author awudzins <adam.wudzinski@nokia.com> Fri Mar 13 16:54:18 2020 +0100
committer awudzins <adam.wudzinski@nokia.com> Fri Apr 03 11:29:59 2020 +0200
tree 9e0712775bee897d3c0156a8fa6bf9d69846f2ed
parent fa33d3f9cf9b613968bf277284841164d392fc21

Switch client and server to communicate over TLS

Issue-ID: AAF-1084
Signed-off-by: Adam Wudziński <adam.wudzinski@nokia.com>
Change-Id: I7f11b27c7dcdf4fc3eba2d5e64b6dc775c80dd74

docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 851ad31..1ce8ed4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,16 +18,25 @@
     networks:
       - certservice
 
-  certservice:
+  aaf-cert-service:
     image: onap/org.onap.aaf.certservice.aaf-certservice-api:latest
-    container_name: aafcert-service
     volumes:
       - ./certService/helm/aaf-cert-service/resources/cmpServers.json:/etc/onap/aaf/certservice/cmpServers.json
+      - ./certs/truststore.jks:/etc/onap/aaf/certservice/certs/truststore.jks
+      - ./certs/root.crt:/etc/onap/aaf/certservice/certs/root.crt
+      - ./certs/certServiceServer-keystore.jks:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.jks
+      - ./certs/certServiceServer-keystore.p12:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.p12
+    container_name: aafcert-service
     ports:
-      - "8080:8080"
+      - "8443:8443"
     depends_on:
       ejbca:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "curl https://localhost:8443/actuator/health --cacert /etc/onap/aaf/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/aaf/certservice/certs/certServiceServer-keystore.p12 --pass secret"]
+      interval: 10s
+      timeout: 3s
+      retries: 15
     networks:
       - certservice