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-apex-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-apex-pdp')
| -rw-r--r-- | scripts/policy/policy-apex-pdp/docker-compose-apex.yml | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml index 9039b894..e836a589 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 @@ 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 @@ -48,13 +49,12 @@ services: - 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 @@ services: - "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 |