Code Review
/
appc
/
deployment.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change to appc release 1.7.1
[appc/deployment.git]
/
docker-compose
/
docker-compose.yml
diff --git
a/docker-compose/docker-compose.yml
b/docker-compose/docker-compose.yml
index
dfceb9f
..
b5f0506
100644
(file)
--- a/
docker-compose/docker-compose.yml
+++ b/
docker-compose/docker-compose.yml
@@
-27,7
+27,7
@@
networks:
services:
db:
services:
db:
- image: mariadb:10.
1.11
+ image: mariadb:10.
4.3
container_name: sdnc_db_container
ports:
- "3306"
container_name: sdnc_db_container
ports:
- "3306"
@@
-41,7
+41,7
@@
services:
max-file: "5"
ansible:
max-file: "5"
ansible:
- image: onap/
sdnc
-ansible-server-image:latest
+ image: onap/
ccsdk
-ansible-server-image:latest
depends_on :
- db
container_name: appc_ansible_container
depends_on :
- db
container_name: appc_ansible_container
@@
-50,6
+50,8
@@
services:
- "8000"
links:
- db:dbhost
- "8000"
links:
- db:dbhost
+ - db:sdnctldb01
+ - db:sdnctldb02
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
logging:
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
logging:
@@
-70,12
+72,15
@@
services:
container_name: appc_controller_container
entrypoint: ["/opt/onap/appc/bin/startODL.sh"]
ports:
container_name: appc_controller_container
entrypoint: ["/opt/onap/appc/bin/startODL.sh"]
ports:
+ - "8443:8443"
- "8282:8181"
- "1830:1830"
- "9090:9191"
- "30290:9191"
links:
- db:dbhost
- "8282:8181"
- "1830:1830"
- "9090:9191"
- "30290:9191"
links:
- db:dbhost
+ - db:sdnctldb01
+ - db:sdnctldb02
- ansible:ansiblehost
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- ansible:ansiblehost
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
@@
-102,6
+107,8
@@
services:
- "3000:3100"
links:
- db:dbhost
- "3000:3100"
links:
- db:dbhost
+ - db:sdnctldb01
+ - db:sdnctldb02
- appc:sdnhost
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- appc:sdnhost
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
@@
-120,7
+127,7
@@
services:
entrypoint:
- "/opt/startCdt.sh"
ports:
entrypoint:
- "/opt/startCdt.sh"
ports:
- - "8080:80"
+ - "8080:
180
80"
links:
- appc:sdnhost
environment:
links:
- appc:sdnhost
environment: