summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2019-08-27 17:56:04 -0700
committersebdet <sebastien.determe@intl.att.com>2019-08-28 15:59:05 +0200
commit1e86592650fc695615e0fa34c947b32693d03466 (patch)
treee970e02d2cb56c94276971a271f028db9471f0ac /extra
parent56f5c144cfff229235817feda9baf4036b22156a (diff)
Fix frontend docker
Fix the frontend docker in Nginx with https for backend in https as well Issue-ID: CLAMP-486 Change-Id: I33fd89289618affa5e734c80991aaefece31309e Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'extra')
-rw-r--r--extra/docker/clamp/clamp.env2
-rw-r--r--extra/docker/clamp/docker-compose.yml20
2 files changed, 13 insertions, 9 deletions
diff --git a/extra/docker/clamp/clamp.env b/extra/docker/clamp/clamp.env
index fee3152e..ae6dbec1 100644
--- a/extra/docker/clamp/clamp.env
+++ b/extra/docker/clamp/clamp.env
@@ -1,2 +1,2 @@
### Be careful, this must be in one line only ###
-SPRING_APPLICATION_JSON={"spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3"} \ No newline at end of file
+SPRING_APPLICATION_JSON={"spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3","spring.profiles.active":"clamp-default,clamp-default-user,clamp-sdc-controller-new","clamp.config.policy.api.url":"http4://third-party-proxy:8085","clamp.config.policy.pap.url":"http4://third-party-proxy:8085","clamp.config.dcae.inventory.url":"http://third-party-proxy:8085","clamp.config.dcae.deployment.url":"http4://third-party-proxy:8085"}
diff --git a/extra/docker/clamp/docker-compose.yml b/extra/docker/clamp/docker-compose.yml
index f41473e9..7026de91 100644
--- a/extra/docker/clamp/docker-compose.yml
+++ b/extra/docker/clamp/docker-compose.yml
@@ -1,6 +1,12 @@
-version: '2'
+version: '3.1'
services:
+ clamp-frontend:
+ image: onap/clamp-frontend
+ depends_on:
+ - clamp-backend
+ ports:
+ - "443:443"
db:
image: mariadb:10.3.12
volumes:
@@ -12,23 +18,21 @@ services:
ports:
- "3306:3306"
- clamp:
+ clamp-backend:
image: onap/clamp-backend
- volumes:
- - "./config/:/opt/clamp/config:rw"
depends_on:
- db
+ - third-party-proxy
env_file:
- clamp.env
ports:
- - "8080:8080"
- "8443:8443"
-
- third_party_proxy:
+
+ third-party-proxy:
image: python:2-slim
volumes:
- "../../../src/test/resources/http-cache/example/:/thirdparty:rw"
- "../../../src/test/resources/http-cache/:/script/:ro"
ports:
- "8085:8085"
- command: /bin/sh -c "pip install requests && pip install simplejson && python -u /script/third_party_proxy.py -v true --port 8085 --root /thirdparty --proxyaddress third_party_proxy:8085"
+ command: /bin/sh -c "pip install requests && pip install simplejson && python -u /script/third_party_proxy.py -v true --port 8085 --root /thirdparty --proxyaddress third-party-proxy:8085"