Code Review
/
integration
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "pnf sw upgrade csit"
[integration/csit.git]
/
scripts
/
policy
/
docker-compose-pap.yml
diff --git
a/scripts/policy/docker-compose-pap.yml
b/scripts/policy/docker-compose-pap.yml
index
115f884
..
970f116
100644
(file)
--- a/
scripts/policy/docker-compose-pap.yml
+++ b/
scripts/policy/docker-compose-pap.yml
@@
-17,7
+17,7
@@
networks:
driver: bridge
services:
mariadb:
driver: bridge
services:
mariadb:
- image: mariadb:
10.2.14
+ image: mariadb:
${POLICY_MARIADB_VER}
container_name: mariadb
hostname: mariadb
command: ['--lower-case-table-names=1', '--wait_timeout=28800']
container_name: mariadb
hostname: mariadb
command: ['--lower-case-table-names=1', '--wait_timeout=28800']
@@
-27,15
+27,15
@@
services:
ports:
- "3306:3306"
pap:
ports:
- "3306:3306"
pap:
- image: nexus3.onap.org:10001/onap/policy-pap:
2.0.0-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-pap:
${POLICY_PAP_VERSION}
container_name: policy-pap
container_name: policy-pap
- depends_on:
- -
"mariadb"
+ depends_on:
+ -
mariadb
hostname: policy-pap
ports:
- "6969:6969"
api:
hostname: policy-pap
ports:
- "6969:6969"
api:
- image: nexus3.onap.org:10001/onap/policy-api
+ image: nexus3.onap.org:10001/onap/policy-api
:${POLICY_API_VERSION}
container_name: policy-api
depends_on:
- mariadb
container_name: policy-api
depends_on:
- mariadb
@@
-44,8
+44,24
@@
services:
- "9969:6969"
start_dependencies:
image: dadarek/wait-for-dependencies
- "9969:6969"
start_dependencies:
image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
container_name: policy-wait
depends_on:
- mariadb
hostname: policy-wait
command: mariadb:3306
container_name: policy-wait
depends_on:
- mariadb
hostname: policy-wait
command: mariadb:3306
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - pap
+ - api
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ pap:6969
+ api:6969