From f69f8fa4fc881c40f16cbc3e3f0fe1c7d46e2c80 Mon Sep 17 00:00:00 2001
From: prasadtalasila <prasad.talasila@gmail.com>
Date: Thu, 12 Dec 2024 13:50:59 +0100
Subject: [PATCH] Fixes mistakes in the docker compose files

---
 deploy/config/libms.yaml          | 12 ++++++++++--
 servers/lib/DEVELOPER.md          |  4 ++++
 servers/lib/compose.lib.dev.yml   |  6 +++---
 servers/lib/compose.lib.yml       |  1 +
 servers/lib/config/libms.dev.yaml |  2 +-
 servers/lib/libms.yaml.sample     | 12 ------------
 6 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 servers/lib/libms.yaml.sample

diff --git a/deploy/config/libms.yaml b/deploy/config/libms.yaml
index e0996565e..30b1f0c54 100644
--- a/deploy/config/libms.yaml
+++ b/deploy/config/libms.yaml
@@ -1,6 +1,14 @@
 port: '4001'
-mode: 'local'
+mode: 'local'    #git or local
 local-path: '/dtaas/libms/files'
 log-level: 'debug'
 apollo-path: '/lib'
-graphql-playground: 'true'
\ No newline at end of file
+graphql-playground: 'true'
+
+git-repos:   #only used in git mode
+  - user1:
+      repo-url: 'https://gitlab.com/dtaas/user1.git'
+  - user2:
+      repo-url: 'https://gitlab.com/dtaas/user2.git'
+  - common:
+      repo-url: 'https://gitlab.com/dtaas/common.git'
\ No newline at end of file
diff --git a/servers/lib/DEVELOPER.md b/servers/lib/DEVELOPER.md
index ebb7ae5d3..ebad3714e 100644
--- a/servers/lib/DEVELOPER.md
+++ b/servers/lib/DEVELOPER.md
@@ -119,6 +119,10 @@ of the microservices uses the configuration
 file available in `config/libms.dev.yaml`.
 
 For more see [configuration documentation](./README.md#gear-configure).
+The `config/libms.dev.yaml` file is used for configuration of the container.
+
+A new directory named `files` is created in `servers/lib` directory and
+files are saved and served from the `files` directory.
 
 ### Use
 
diff --git a/servers/lib/compose.lib.dev.yml b/servers/lib/compose.lib.dev.yml
index abbbb3aa4..6e8e9ac0e 100644
--- a/servers/lib/compose.lib.dev.yml
+++ b/servers/lib/compose.lib.dev.yml
@@ -4,7 +4,7 @@ services:
       context: ../../
       dockerfile: ./docker/libms.dockerfile
     volumes:
-      - ${LOCAL_PATH}:/dtaas/libms/files
-      - ./config/libms.dev.yaml:/dtaas/libms/config/libms.yaml
+      - ./files:/dtaas/libms/files
+      - ./config/libms.dev.yaml:/dtaas/libms/libms.yaml
     ports:
-      - ${PORT}:4001
+      - 4001:4001
diff --git a/servers/lib/compose.lib.yml b/servers/lib/compose.lib.yml
index a4e080791..93e7d0df2 100644
--- a/servers/lib/compose.lib.yml
+++ b/servers/lib/compose.lib.yml
@@ -3,6 +3,7 @@ services:
     image: intocps/libms:latest
     restart: unless-stopped
     volumes:
+      - ./config/libms.dev.yaml:/dtaas/libms/libms.yaml
       - ./files:/dtaas/libms/files
     ports:
       - "4001:4001"
diff --git a/servers/lib/config/libms.dev.yaml b/servers/lib/config/libms.dev.yaml
index 1cd67b261..1a136a56f 100644
--- a/servers/lib/config/libms.dev.yaml
+++ b/servers/lib/config/libms.dev.yaml
@@ -1,6 +1,6 @@
 port: '4001'
 mode: 'local'    #git or local
-local-path: '..\..\files'
+local-path: '/dtaas/libms/files'
 log-level: 'debug'
 apollo-path: '/lib'
 graphql-playground: 'true'
diff --git a/servers/lib/libms.yaml.sample b/servers/lib/libms.yaml.sample
deleted file mode 100644
index 956374c3f..000000000
--- a/servers/lib/libms.yaml.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-port: '4001'
-mode: 'git'
-local-path: '..\..\files'
-log-level: 'debug'
-apollo-path: '/lib'
-graphql-playground: 'true'
-
-git-repos:
-  - user-1: 
-      repo-url: 'https://github.com/isomorphic-git/lightning-fs'
-  - user-2: 
-      repo-url: 'https://github.com/isomorphic-git/lightning-fs'
\ No newline at end of file