From 954af9374e4cffb7f0d0bfba0443ca1b12ec90bc Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 3 Jun 2019 15:00:08 -0400 Subject: 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 --- plans/policy/xacml-pdp/setup.sh | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'plans/policy/xacml-pdp') diff --git a/plans/policy/xacml-pdp/setup.sh b/plans/policy/xacml-pdp/setup.sh index 96ae4715..24fc2d7c 100644 --- a/plans/policy/xacml-pdp/setup.sh +++ b/plans/policy/xacml-pdp/setup.sh @@ -60,7 +60,13 @@ sleep 3 # Adding this waiting container due to race condition between pap and mariadb docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml run --rm start_dependencies -docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml up -d + +#Configure the database +docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh +docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh + +# now bring everything else up +docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml run --rm start_all unset http_proxy https_proxy @@ -77,25 +83,4 @@ echo PAP IP IS ${POLICY_PAP_IP} echo MARIADB IP IS ${MARIADB_IP} echo DMAAP_IP IS ${DMAAP_IP} -# Wait for initialization -for i in {1..10}; do - curl -sS ${MARIADB_IP}:3306 && break - echo sleep $i - sleep $i -done -for i in {1..10}; do - curl -sS ${POLICY_PDPX_IP}:6969 && break - echo sleep $i - sleep $i -done -for i in {1..10}; do - curl -sS ${DMAAP_IP}:3904 && break - echo sleep $i - sleep $i -done - -#Configure the database -docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh -docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh - ROBOT_VARIABLES="-v POLICY_PDPX_IP:${POLICY_PDPX_IP} -v POLICY_API_IP:${POLICY_API_IP} -v POLICY_PAP_IP:${POLICY_PAP_IP}" -- cgit 1.2.3-korg