Run DB script before starting other containers
The other containers were starting before their user names had
been added to the DB. Consequently, they were aborting at start-up.
Modified the various setup.sh scripts to run the DB-init script
before starting the remaing containers.
Also add start_all to start the containers and wait for the ports
to start listening, eliminating the need for the "curl" tests in
the setup.sh scripts.
Also removed version numbers from some yml files.
Change-Id: Idd9ff81b3ab4a78926b644f22360c9222afe82d5
Issue-ID: POLICY-1829
Signed-off-by: Jim Hahn <jrh3@att.com>
diff --git a/scripts/policy/docker-compose-api.yml b/scripts/policy/docker-compose-api.yml
index 452297f..5cf5a27 100644
--- a/scripts/policy/docker-compose-api.yml
+++ b/scripts/policy/docker-compose-api.yml
@@ -36,8 +36,22 @@
- "6969: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
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - api
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ api:6969
diff --git a/scripts/policy/docker-compose-pap.yml b/scripts/policy/docker-compose-pap.yml
index 115f884..383e1bc 100644
--- a/scripts/policy/docker-compose-pap.yml
+++ b/scripts/policy/docker-compose-pap.yml
@@ -27,10 +27,10 @@
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
container_name: policy-pap
depends_on:
- - "mariadb"
+ - mariadb
hostname: policy-pap
ports:
- "6969:6969"
@@ -44,8 +44,24 @@
- "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
+ 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
diff --git a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
index 9039b89..e836a58 100644
--- a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
+++ b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
@@ -1,4 +1,5 @@
# Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright (C) 2019 AT&T Intellectual Property.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -33,7 +34,7 @@
ports:
- "3904:3904"
pap:
- image: nexus3.onap.org:10001/onap/policy-pap:2.0.0-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-pap
container_name: policy-pap
depends_on:
- mariadb
@@ -48,13 +49,12 @@
- mariadb
hostname: policy-api
apex:
- image: nexus3.onap.org:10001/onap/policy-apex-pdp:2.1-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-apex-pdp
container_name: policy-apex-pdp
depends_on:
- mariadb
- dmaap
- pap
- - api
hostname: policy-apex-pdp
command: ['/opt/app/policy/apex-pdp/bin/apexOnapPf.sh', '-c', '/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json', '-p', '/opt/app/policy/apex-pdp/etc/onappf/config/topic.properties']
volumes:
@@ -64,11 +64,31 @@
- "23324:23324"
start_dependencies:
image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
container_name: policy-wait
depends_on:
- mariadb
- dmaap
hostname: policy-wait
command:
- - mariadb:3306
- - dmaap:3904
+ mariadb:3306
+ dmaap:3904
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - dmaap
+ - api
+ - pap
+ - apex
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ dmaap:3904
+ api:6969
+ pap:6969
+ apex:6969
diff --git a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml
index 62e0ce2..96a4b12 100644
--- a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml
+++ b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml
@@ -37,7 +37,7 @@
ports:
- "3904:3904"
pap:
- image: nexus3.onap.org:10001/onap/policy-pap:2.0.0-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-pap
container_name: policy-pap
depends_on:
- mariadb
@@ -50,23 +50,42 @@
- mariadb
hostname: policy-api
xacml-pdp:
- image: nexus3.onap.org:10001/onap/policy-xacml-pdp:2.0.0-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-xacml-pdp
container_name: policy-xacml-pdp
depends_on:
- mariadb
- message-router
- pap
- - api
hostname: policy-xacml-pdp
ports:
- "6969:6969"
start_dependencies:
image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
container_name: policy-wait
depends_on:
- mariadb
- message-router
hostname: policy-wait
command:
- - mariadb:3306
- - message-router:3904
+ mariadb:3306
+ message-router:3904
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - message-router
+ - api
+ - pap
+ - xacml-pdp
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ message-router:3904
+ api:6969
+ pap:6969
+ xacml-pdp:6969