From f7495cc5cff20f0f7bfe8d3f908a7b917f73cc44 Mon Sep 17 00:00:00 2001
From: kurczews <krzysztof.kurczewski@nokia.com>
Date: Fri, 3 Aug 2018 09:33:10 +0200
Subject: Improve docker installation

Issue-ID: VID-279
Change-Id: If592225832c2e549182ebbb888f4b92f5b91f0e3
Signed-off-by: kurczews <krzysztof.kurczewski@nokia.com>
---
 .../main/docker/docker-files/docker-compose.yml    | 38 ++++++++++++++--------
 docs/installation.rst                              |  5 +++
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml
index 508867a7e..48670e1b1 100755
--- a/deliveries/src/main/docker/docker-files/docker-compose.yml
+++ b/deliveries/src/main/docker/docker-files/docker-compose.yml
@@ -1,14 +1,26 @@
-version: '2'
+version: '3.1'
+
 services:
-        vid-server:
-                image: onap/vid
-                ports:
-                - "8080:8080"
-                links:
-                - vid-mariadb:vid-mariadb-docker-instance
-        vid-mariadb:
-                image: mariadb:10.1.11
-                ports:
-                - "3306:3306"
-                volumes:
-                - /var/lib/mysql
+    vid-server:
+        image: nexus3.onap.org:10001/onap/vid
+        ports:
+            - "8080:8080"
+        links:
+            - vid-mariadb:vid-mariadb-docker-instance
+        environment:
+            VID_MYSQL_DBNAME: vid_openecomp_epsdk
+            VID_MYSQL_PASS: YOUR_PASSWORD
+
+    vid-mariadb:
+        image: mariadb:10
+        ports:
+            - "3306:3306"
+        volumes:
+            - ../../../../../lf_config/vid-my.cnf:/etc/mysql/my.cnf
+            - ../../../../../lf_config/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql
+            - /var/lib/mysql
+        environment:
+            MYSQL_DATABASE: vid_openecomp_epsdk
+            MYSQL_USER: vidadmin
+            MYSQL_PASSWORD: YOUR_PASSWORD
+            MYSQL_ROOT_PASSWORD: ROOT_PASSWORD
\ No newline at end of file
diff --git a/docs/installation.rst b/docs/installation.rst
index 54415add5..f761c6afe 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -29,3 +29,8 @@ Please follow the instructions given below, for installing VID using a Docker im
    #start VID server
    docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:1.2.1
 
+Or use docker-compose:
+
+.. code-block:: bash
+
+   docker-compose up
\ No newline at end of file
-- 
cgit 1.2.3-korg