diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-08-12 11:23:28 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-08-13 16:09:14 -0400 |
| commit | d4a4318d15b9ad92fd46b35c125de8db6a5f689a (patch) | |
| tree | e5c539055999cc01471a4fda8a33242a7825f8c3 /ms/generic-resource-api/src/main/dc/docker-compose.yaml | |
| parent | adbe44c387bd2ff2ca0659345b1941735993ba0c (diff) | |
Fix test issues
Added property settings to all test cases to correct issue in staging
build, where properties do not appear to be taking place properly.
Also, fixed issues found in testing with docker compose.
Change-Id: If698e212d91cd630af4c4a33dd70d90078923478
Issue-ID: SDNC-1315
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'ms/generic-resource-api/src/main/dc/docker-compose.yaml')
| -rwxr-xr-x | ms/generic-resource-api/src/main/dc/docker-compose.yaml | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/ms/generic-resource-api/src/main/dc/docker-compose.yaml b/ms/generic-resource-api/src/main/dc/docker-compose.yaml index 0117fee..438b4bb 100755 --- a/ms/generic-resource-api/src/main/dc/docker-compose.yaml +++ b/ms/generic-resource-api/src/main/dc/docker-compose.yaml @@ -3,7 +3,7 @@ version: '2.1' services: db: image: mariadb:10.5 - container_name: gra_db_container + container_name: gra_db ports: - "13306:3306" environment: @@ -23,7 +23,7 @@ services: image: onap/sdnc-gra-image:latest depends_on: - db - container_name: sdnc_gra_container + container_name: gra_controller ports: - "8080:8080" - "8443:8443" @@ -50,4 +50,31 @@ services: extra_hosts: aaf-onap-test.osaaf.org: 10.12.5.145 - + dgbuilder: + image: onap/ccsdk-dgbuilder-image:latest + depends_on: + - db + container_name: gra_dgbuilder + entrypoint: + - "/bin/bash" + - "-c" + - "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait" + ports: + - "3200:3100" + volumes: + - ${HOME}/gerrit/sdnc/oam/platform-logic:/opt/onap/ccsdk/platform-logic + links: + - db:dbhost + - db:sdnctldb01 + - db:sdnctldb02 + environment: + - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties + - MYSQL_USER=sdnc + - MYSQL_PASSWORD=abc23 + - MYSQL_DATABASE=sdnctl + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" |