Merge pull request #10 from DaemonSharps/feature/add_garage

Добавил бек гаража и еще одну БД

Author: DaemonSharps

Diff for: GarageSite/GarageApi/api.env

@@ -1,2 +1,2 @@
 DOTNET_ENVIRONMENT=Development
-GARAGE_DB_CONNECTION_STRING='Host=garage-site-development-garage-db-1;Port=4432;Database=garage_db;Username=root;Password=1;'
+GARAGE_DB_CONNECTION_STRING='Host=garage-site-development-garage-db-1;Port=5432;Database=garage_db;Username=root;Password=1;'

Diff for: GarageSite/GarageApi/db.env

@@ -1,4 +1,5 @@
 #Переменные JWTProvider BD для локальной отладки
 POSTGRES_PASSWORD=1
 POSTGRES_USER=root
-POSTGRES_DB=garage_db
+POSTGRES_DB=garage_db
+PGDATA='/var/lib/postgresql/data/garage'

Diff for: GarageSite/JWTProvider/db.env

@@ -1,4 +1,5 @@
 #Переменные JWTProvider BD для локальной отладки
 POSTGRES_PASSWORD=1
 POSTGRES_USER=root
-POSTGRES_DB=users_db
+POSTGRES_DB=users_db
+PGDATA='/var/lib/postgresql/data/jwt'

Diff for: GarageSite/compose.yml

@@ -5,26 +5,34 @@ services:
       - "${JWT_DB_PORT}:5432"
     env_file: 
     - ./JWTProvider/db.env
+    volumes:
+      - auth-data:/var/lib/postgresql/data/
     networks:
-      - jwt-auth
+      - jwt-backend
 
   jwt-api: 
     image: daemonsharps/jwt-auth-api:${JWT_API_TAG}
     ports: 
       - "${JWT_API_PORT}:80"
     depends_on:
+      - garage-db
       - jwt-db
     env_file: 
-    - ./JWTProvider/api.env
+      - ./JWTProvider/api.env
     networks:
-      - jwt-auth
+      - jwt-backend
+      - api
 
   garage-db:
     image: postgres:${GARAGE_DB_TAG}
     ports:
       - "${GARAGE_DB_PORT}:5432"
     env_file: 
-    - ./GarageApi/db.env
+      - ./GarageApi/db.env
+    depends_on:
+      - jwt-db
+    volumes:
+      - users-data:/var/lib/postgresql/data/
     networks:
       - garage-backend
 
@@ -34,13 +42,18 @@ services:
       - "${GARAGE_API_PORT}:80"
     depends_on:
       - garage-db
+      - jwt-db
     env_file:
       - ./GarageApi/api.env
     networks:
       - garage-backend
-      - jwt-auth
+      - api
 
+volumes:
+  users-data:
+  auth-data:
 
 networks:
-  jwt-auth: {}
-  garage-backend: {}
+  jwt-backend: {}
+  garage-backend: {}
+  api: {}