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/docker-compose-api.yml | |
| 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/docker-compose-api.yml')
| -rw-r--r-- | scripts/policy/docker-compose-api.yml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/policy/docker-compose-api.yml b/scripts/policy/docker-compose-api.yml index 452297fb..5cf5a27c 100644 --- a/scripts/policy/docker-compose-api.yml +++ b/scripts/policy/docker-compose-api.yml @@ -36,8 +36,22 @@ services: - "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 |