diff options
| author |   Jim Hahn <jrh3@att.com> | 2019-06-03 15:00:08 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2019-06-05 09:23:36 -0400 |
| commit | 954af9374e4cffb7f0d0bfba0443ca1b12ec90bc (patch) | |
| tree | c48ddedbce1b0d37834dc18d86e4d8576ffb980f /scripts/policy/policy-xacml-pdp | |
| parent | fbcd0e2ef7049e3bc03464509b868fb48a9f7da9 (diff) | |
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>
Diffstat (limited to 'scripts/policy/policy-xacml-pdp')
| -rw-r--r-- | scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml index 62e0ce21..96a4b122 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 @@ services: 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 @@ services: - 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 |