From 1ebe7ecef97bdac055c8ed67c5b379a4f6c89c4c Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 2 Apr 2020 13:32:01 -0400 Subject: Move policy preload to robot script Moved the policy preload for the PAP CSIT from setup.sh to the robot script; policy type preload isn't needed, so it was removed altogether. Also cleaned up some unneeded entries related to networking and ports in the docker yml files. Issue-ID: POLICY-2464 Change-Id: I1794dd905f2dcbdbe5f8da8c106b43b98d9a97ea Signed-off-by: Jim Hahn --- scripts/policy/docker-compose-api.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'scripts/policy/docker-compose-api.yml') diff --git a/scripts/policy/docker-compose-api.yml b/scripts/policy/docker-compose-api.yml index 1bab1894..e32190f1 100644 --- a/scripts/policy/docker-compose-api.yml +++ b/scripts/policy/docker-compose-api.yml @@ -1,4 +1,4 @@ -# Copyright 2019 AT&T Intellectual Property. All rights reserved +# Copyright 2019-2020 AT&T Intellectual Property. All rights reserved # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. version: '2' -networks: - default: - driver: bridge services: mariadb: image: mariadb:${POLICY_MARIADB_VER} @@ -24,16 +21,16 @@ services: env_file: config/db/db.conf volumes: - ./config/db:/docker-entrypoint-initdb.d - ports: - - "3306:3306" + expose: + - 3306 api: image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION} container_name: policy-api depends_on: - mariadb hostname: policy-api - ports: - - "6969:6969" + expose: + - 6969 start_dependencies: image: dadarek/wait-for-dependencies environment: -- cgit 1.2.3-korg