From 178ff256e63859a88f535cee3ae33bd6c35497f2 Mon Sep 17 00:00:00 2001 From: kurczews Date: Wed, 14 Nov 2018 08:14:58 +0100 Subject: Add simulator to docker-compose.yml Issue-ID: VID-354 Change-Id: If531a133c6d6267e5b956cbb9852fc15e24642d5 Signed-off-by: kurczews --- deliveries/.gitignore | 2 ++ .../src/main/docker/docker-files/docker-compose.yml | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 deliveries/.gitignore (limited to 'deliveries') diff --git a/deliveries/.gitignore b/deliveries/.gitignore new file mode 100644 index 000000000..54a4f4f69 --- /dev/null +++ b/deliveries/.gitignore @@ -0,0 +1,2 @@ +# provide developers possibility to add or override custom properties in compose without polluting code base +docker-compose.override.yml \ No newline at end of file diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml index 644590191..eedf7322e 100755 --- a/deliveries/src/main/docker/docker-files/docker-compose.yml +++ b/deliveries/src/main/docker/docker-files/docker-compose.yml @@ -1,15 +1,21 @@ -version: '3.1' +version: '3.2' + +# Please note this configuration is provided for local development. Do not use it on production. services: vid-server: - image: nexus3.onap.org:10001/onap/vid + image: onap/vid:latest ports: - "8080:8080" - links: - - vid-mariadb:vid-mariadb-docker-instance environment: VID_MYSQL_DBNAME: vid_openecomp_epsdk VID_MYSQL_PASS: YOUR_PASSWORD + VID_MYSQL_HOST: vid-mariadb + ASDC_CLIENT_REST_PROTOCOL: http + ASDC_CLIENT_REST_HOST: vid-simulator + ASDC_CLIENT_REST_PORT: 1080 + VID_AAI_URL: http://vid-simulator:1080 + VID_MSO_SERVER_URL: http://vid-simulator:1080 vid-mariadb: image: mariadb:10 @@ -22,4 +28,7 @@ services: MYSQL_DATABASE: vid_openecomp_epsdk MYSQL_USER: vidadmin MYSQL_PASSWORD: YOUR_PASSWORD - MYSQL_ROOT_PASSWORD: ROOT_PASSWORD \ No newline at end of file + MYSQL_ROOT_PASSWORD: ROOT_PASSWORD + + vid-simulator: + image: onap/vid-simulator:latest \ No newline at end of file -- cgit 1.2.3-korg