From b7b10be062e19c7eedd81443f697de5a67998f92 Mon Sep 17 00:00:00 2001
From: Venkatesh Babu <154209057+vbabuEM@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:47:10 +0530
Subject: [PATCH] Use docker volumes for support services and bap/bpp (#54)

* Add volumes for bap

* Add volumes for bpp

* Fix typo

* Remove version due to obsolete warning
---
 install/beckn-onix.sh                | 16 ++++++++++++++++
 install/docker-compose-app.yml       | 15 ++++++++++-----
 install/docker-compose-bap.yml       | 28 ++++++++++++++++++++++++----
 install/docker-compose-bpp.yml       | 27 +++++++++++++++++++++++----
 install/docker-compose-gateway.yml   |  3 +--
 install/docker-compose-registry.yml  |  3 +--
 install/docker-compose-v2.yml        |  3 +--
 install/docker-compose.yml           |  4 +---
 install/scripts/update_bpp_config.sh |  2 +-
 9 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/install/beckn-onix.sh b/install/beckn-onix.sh
index 6f61127..5d63036 100755
--- a/install/beckn-onix.sh
+++ b/install/beckn-onix.sh
@@ -116,6 +116,14 @@ install_bap_protocol_server(){
         bash scripts/update_bap_config.sh
     fi
     sleep 10
+    docker volume create bap_client_config_volume
+    docker volume create bap_network_config_volume
+    docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_client_config_volume:/target busybox cp /source/bap-client.yml /target/default.yml
+    docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_client_config_volume:/target busybox cp /source/bap-client.yaml-sample /target
+    docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_network_config_volume:/target busybox cp /source/bap-network.yml /target/default.yml
+    docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_network_config_volume:/target busybox cp /source/bap-network.yaml-sample /target
+    docker rmi busybox
+
     start_container "docker-compose-bap.yml" "bap-client"
     start_container "docker-compose-bap.yml" "bap-network"
     sleep 10
@@ -140,6 +148,14 @@ install_bpp_protocol_server(){
     fi
 
     sleep 10
+    docker volume create bpp_client_config_volume
+    docker volume create bpp_network_config_volume
+    docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_client_config_volume:/target busybox cp /source/bpp-client.yml /target/default.yml
+    docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_client_config_volume:/target busybox cp /source/bpp-client.yaml-sample /target
+    docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_network_config_volume:/target busybox cp /source/bpp-network.yml /target/default.yml
+    docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bpp_network_config_volume:/target busybox cp /source/bpp-network.yaml-sample /target
+    docker rmi busybox
+
     start_container "docker-compose-bpp.yml" "bpp-client"
     start_container "docker-compose-bpp.yml" "bpp-network"
     sleep 10
diff --git a/install/docker-compose-app.yml b/install/docker-compose-app.yml
index b31bac4..ce15d6b 100644
--- a/install/docker-compose-app.yml
+++ b/install/docker-compose-app.yml
@@ -1,12 +1,10 @@
-version: "3"
-
 services:
   mongo_db:
     image: mongo
     restart: unless-stopped
     container_name: mongoDB
     volumes:
-      - ./docker_data/mongo_DB:/data/db
+      - beckn_mongo_db:/data/db
     networks:
       - beckn_network
     ports:
@@ -25,7 +23,7 @@ services:
     ports:
       - "6379:6379"
     volumes:
-      - ./docker_data/redis_DB:/data
+      - beckn_redis:/data
 
   queue_service:
     image: rabbitmq:3.9.11-management-alpine
@@ -43,4 +41,11 @@ services:
 
 networks:
   beckn_network:
-    driver: bridge
\ No newline at end of file
+    name: beckn_network
+    driver: bridge
+
+volumes:
+  beckn_mongo_db:
+    name: beckn_mongo_db
+  beckn_redis:
+    name: beckn_redis
diff --git a/install/docker-compose-bap.yml b/install/docker-compose-bap.yml
index 6aced59..5c9e83b 100644
--- a/install/docker-compose-bap.yml
+++ b/install/docker-compose-bap.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   bap-client:
     image: fidedocker/protocol-server
@@ -10,7 +8,9 @@ services:
       - 5001:5001
     restart: unless-stopped
     volumes:
-      - ./protocol-server-data/bap-client.yml:/usr/src/app/config/default.yml
+      - bap_client_config_volume:/usr/src/app/config
+      - bap_client_schemas_volume:/usr/src/app/schemas
+      - bap_client_logs_volume:/usr/src/app/logs
 
   bap-network:
     image: fidedocker/protocol-server
@@ -21,7 +21,27 @@ services:
       - 5002:5002
     restart: unless-stopped
     volumes:
-      - ./protocol-server-data/bap-network.yml:/usr/src/app/config/default.yml
+      - bap_network_config_volume:/usr/src/app/config
+      - bap_network_schemas_volume:/usr/src/app/schemas
+      - bap_network_logs_volume:/usr/src/app/logs
+
 networks:
   beckn_network:
+    name: beckn_network
     driver: bridge
+
+volumes:
+  bap_client_config_volume:
+    name: bap_client_config_volume
+    external: true
+  bap_client_schemas_volume:
+    name: bap_client_schemas_volume
+  bap_client_logs_volume:
+    name: bap_client_logs_volume
+  bap_network_config_volume:
+    name: bap_network_config_volume
+    external: true
+  bap_network_schemas_volume:
+    name: bap_network_schemas_volume
+  bap_network_logs_volume:
+    name: bap_network_logs_volume
diff --git a/install/docker-compose-bpp.yml b/install/docker-compose-bpp.yml
index 5e50b81..2747275 100644
--- a/install/docker-compose-bpp.yml
+++ b/install/docker-compose-bpp.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   bpp-client:
     image: fidedocker/protocol-server
@@ -10,7 +8,9 @@ services:
       - 6001:6001
     restart: unless-stopped
     volumes:
-      - ./protocol-server-data/bpp-client.yml:/usr/src/app/config/default.yml
+      - bpp_client_config_volume:/usr/src/app/config
+      - bpp_client_schemas_volume:/usr/src/app/schemas
+      - bpp_client_logs_volume:/usr/src/app/logs
 
   bpp-network:
     image: fidedocker/protocol-server
@@ -21,8 +21,27 @@ services:
       - 6002:6002
     restart: unless-stopped
     volumes:
-      - ./protocol-server-data/bpp-network.yml:/usr/src/app/config/default.yml
+      - bpp_network_config_volume:/usr/src/app/config
+      - bpp_network_schemas_volume:/usr/src/app/schemas
+      - bpp_network_logs_volume:/usr/src/app/logs
 
 networks:
   beckn_network:
+    name: beckn_network
     driver: bridge
+
+volumes:
+  bpp_client_config_volume:
+    name: bpp_client_config_volume
+    external: true
+  bpp_client_schemas_volume:
+    name: bpp_client_schemas_volume
+  bpp_client_logs_volume:
+    name: bpp_client_logs_volume
+  bpp_network_config_volume:
+    name: bpp_network_config_volume
+    external: true
+  bpp_network_schemas_volume:
+    name: bpp_network_schemas_volume
+  bpp_network_logs_volume:
+    name: bpp_network_logs_volume
diff --git a/install/docker-compose-gateway.yml b/install/docker-compose-gateway.yml
index 67113c5..96322dc 100644
--- a/install/docker-compose-gateway.yml
+++ b/install/docker-compose-gateway.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   gateway:
     image: fidedocker/gateway
@@ -16,6 +14,7 @@ services:
 
 networks:
   beckn_network:
+    name: beckn_network
     driver: bridge
 
 volumes:
diff --git a/install/docker-compose-registry.yml b/install/docker-compose-registry.yml
index dad20af..a07d43f 100644
--- a/install/docker-compose-registry.yml
+++ b/install/docker-compose-registry.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   registry:
     image: fidedocker/registry
@@ -16,6 +14,7 @@ services:
 
 networks:
   beckn_network:
+    name: beckn_network
     driver: bridge
 
 volumes:
diff --git a/install/docker-compose-v2.yml b/install/docker-compose-v2.yml
index 92164df..b73857b 100644
--- a/install/docker-compose-v2.yml
+++ b/install/docker-compose-v2.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   registry:
     image: fidedocker/registry
@@ -106,6 +104,7 @@ services:
 
 networks:
   beckn_network:
+    name: beckn_network
     driver: bridge
 
 volumes:
diff --git a/install/docker-compose.yml b/install/docker-compose.yml
index eb44d7f..a7cea70 100644
--- a/install/docker-compose.yml
+++ b/install/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   registry:
     image: fidedocker/registry
@@ -114,5 +112,5 @@ services:
 
 networks:
   beckn_network:
+    name: beckn_network
     driver: bridge
-
diff --git a/install/scripts/update_bpp_config.sh b/install/scripts/update_bpp_config.sh
index 88106a6..fbd450d 100755
--- a/install/scripts/update_bpp_config.sh
+++ b/install/scripts/update_bpp_config.sh
@@ -117,7 +117,7 @@ else
 
     )
 
-    echo "Configuring BAP protocol server"
+    echo "Configuring BPP protocol server"
     # Apply replacements in both files
     for file in "$clientFile" "$networkFile"; do
         for key in "${!replacements[@]}"; do