From 36b830db423c893353aa19435f86643f7c6a5272 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <slococo@itba.edu.ar>
Date: Mon, 28 Nov 2022 17:33:17 -0300
Subject: [PATCH] Update run.sh

Co-authored-by: Ezequiel Bellver <ebellver@itba.edu.ar>
Co-authored-by: Juan Barmasch <jbarmasch@itba.edu.ar>
---
 .gitignore         |  1 +
 docker-compose.yml | 10 +++++-----
 run.sh             | 16 +++++++++-------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index efcf1e2..5d51d4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,4 +69,5 @@ cython_debug/
 .vscode/*
 *.obj
 *_data
+data/
 test.py
diff --git a/docker-compose.yml b/docker-compose.yml
index acf99c9..7f553fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,9 +11,9 @@ services:
     ports:
       - "27017:27017"
     volumes:
-      - ./mongo_data/db:/data/db
-      - ./mongo_data/dev.archive:/Databases/dev.archive
-      - ./mongo_data/production:/Databases/production
+      - ./data/mongo/db:/data/db
+      - ./data/mongo/dev.archive:/Databases/dev.archive
+      - ./data/mongo/production:/Databases/production
 
   postgres:
     image: postgres
@@ -25,7 +25,7 @@ services:
       POSTGRES_PASSWORD: password
       POSTGRES_DB: bd2
     volumes:
-      - ./postgres_data:/var/lib/postgresql/data
+      - ./data/postgres:/var/lib/postgresql/data
 
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.4.2
@@ -35,7 +35,7 @@ services:
       - discovery.type=single-node
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     volumes:
-      - ./elasticsearch_data:/usr/share/elasticsearch/data
+      - ./data/elasticsearch:/usr/share/elasticsearch/data
     ports:
       - "9200:9200"
       - "9300:9300"
diff --git a/run.sh b/run.sh
index 887b46d..d1dfbfd 100644
--- a/run.sh
+++ b/run.sh
@@ -4,9 +4,10 @@ usage() {
     cat <<EOF
 usage: ${0##*/} [command]
     -h          Print this help message.
-    -a          Run API.
-    -i          Install.
-    -d          Run docker-compose.
+    -a          Run API on host 0.0.0.0:8000.
+    -i          Install dependencies.
+    -d          Run docker-compose up.
+    -c          Configure databases.
 EOF
     exit 1
 }
@@ -17,7 +18,7 @@ while getopts "hadic" OPTION; do
     a) RUN=api ;;
     d) RUN=docker ;;
     i) RUN=install ;;
-    c) RUN=configure;;
+    c) RUN=configure  ;;
     *) usage ;;
     esac
 done
@@ -30,8 +31,9 @@ elif [ "$RUN" = 'api' ]; then
 elif [ "$RUN" = 'configure' ]; then
     poetry run configure
 else
-    [ ! -d postgres_data ] && mkdir postgres_data
-    [ ! -d mongo_data ] && mkdir mongo_data
-    [ ! -d elasticsearch_data ] && mkdir elasticsearch_data
+    [ ! -d data ] && mkdir data
+    [ ! -d data/postgres ] && mkdir data/postgres
+    [ ! -d data/mongo ] && mkdir data/mongo
+    [ ! -d data/elasticsearch ] && mkdir data/elasticsearch
     docker-compose up
 fi