Code Review
/
clamp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix frontend docker
[clamp.git]
/
extra
/
docker
/
clamp
/
docker-compose.yml
diff --git
a/extra/docker/clamp/docker-compose.yml
b/extra/docker/clamp/docker-compose.yml
index
c7e5fea
..
8d57be0
100644
(file)
--- a/
extra/docker/clamp/docker-compose.yml
+++ b/
extra/docker/clamp/docker-compose.yml
@@
-1,35
+1,38
@@
-version: '
2
'
+version: '
3.1
'
services:
services:
+ clamp-frontend:
+ image: onap/clamp-frontend
+ depends_on:
+ - clamp-backend
+ ports:
+ - "2443:2443"
db:
db:
- image: mariadb:10.
1.11
+ image: mariadb:10.
4.7
volumes:
- "/var/lib/mysql"
- "../mariadb/conf1:/etc/mysql/conf.d:ro"
volumes:
- "/var/lib/mysql"
- "../mariadb/conf1:/etc/mysql/conf.d:ro"
- - "../../sql/:/docker-entrypoint-initdb.d:r
o
"
+ - "../../sql/:/docker-entrypoint-initdb.d:r
w
"
environment:
- MYSQL_ROOT_PASSWORD=strong_pitchou
ports:
- "3306:3306"
environment:
- MYSQL_ROOT_PASSWORD=strong_pitchou
ports:
- "3306:3306"
- clamp:
- image: onap/clamp
- volumes:
- - "./config/:/opt/clamp/config:rw"
+ clamp-backend:
+ image: onap/clamp-backend
depends_on:
- db
depends_on:
- db
+ - third-party-proxy
env_file:
- clamp.env
ports:
env_file:
- clamp.env
ports:
- - "8
080:8080
"
-
-
sdc_
proxy:
+ - "8
443:8443
"
+
+
third-party-
proxy:
image: python:2-slim
volumes:
image: python:2-slim
volumes:
- - "../../../src/test/resources/http-cache/
sdc-example/:/sdc:ro
"
+ - "../../../src/test/resources/http-cache/
example/:/thirdparty:rw
"
- "../../../src/test/resources/http-cache/:/script/:ro"
- "../../../src/test/resources/http-cache/:/script/:ro"
- depends_on:
- - clamp
ports:
- "8085:8085"
ports:
- "8085:8085"
- command: /bin/sh -c "pip install requests &&
python /script/sdc_proxy.py --port 8085 --root /sdc
"
+ 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
"