Improve docker installation

Issue-ID: VID-279
Change-Id: If592225832c2e549182ebbb888f4b92f5b91f0e3
Signed-off-by: kurczews <krzysztof.kurczewski@nokia.com>

diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml
index 508867a..48670e1 100755 (executable)
--- 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'\r
+version: '3.1'\r
+\r
 services:\r
-        vid-server:\r
-                image: onap/vid\r
-                ports:\r
-                - "8080:8080"\r
-                links:\r
-                - vid-mariadb:vid-mariadb-docker-instance\r
-        vid-mariadb:\r
-                image: mariadb:10.1.11\r
-                ports:\r
-                - "3306:3306"\r
-                volumes:\r
-                - /var/lib/mysql\r
+    vid-server:\r
+        image: nexus3.onap.org:10001/onap/vid\r
+        ports:\r
+            - "8080:8080"\r
+        links:\r
+            - vid-mariadb:vid-mariadb-docker-instance\r
+        environment:\r
+            VID_MYSQL_DBNAME: vid_openecomp_epsdk\r
+            VID_MYSQL_PASS: YOUR_PASSWORD\r
+\r
+    vid-mariadb:\r
+        image: mariadb:10\r
+        ports:\r
+            - "3306:3306"\r
+        volumes:\r
+            - ../../../../../lf_config/vid-my.cnf:/etc/mysql/my.cnf\r
+            - ../../../../../lf_config/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql\r
+            - /var/lib/mysql\r
+        environment:\r
+            MYSQL_DATABASE: vid_openecomp_epsdk\r
+            MYSQL_USER: vidadmin\r
+            MYSQL_PASSWORD: YOUR_PASSWORD\r
+            MYSQL_ROOT_PASSWORD: ROOT_PASSWORD
\ No newline at end of file

diff --git a/docs/installation.rst b/docs/installation.rst
index 54415ad..f761c6a 100644 (file)
--- 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