Докеризация, отказ от server.yml файлов, проброс .env

build/docker-compose.dev.yml

@@ -1,16 +0,0 @@
-version: '3.8'
-
-services:
-  db:
-    image: postgres:latest
-    environment:
-      POSTGRES_DB: your_database
-      POSTGRES_USER: your_user
-      POSTGRES_PASSWORD: your_password
-    ports:
-      - "5432:5432"
-
-  adminer:
-    image: adminer
-    ports:
-      - "8080:8080"

build/docker-compose.prod.yml

@@ -1,23 +0,0 @@
-version: '3.8'
-
-services:
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: rosetta-server
-    ports:
-      - "${PORT:-3000}:${PORT:-3000}"
-    environment:
-      - PORT=${PORT:-3000} # Устанавливаем порт по умолчанию 3000, может быть переопределён через переменную окружения
-    depends_on:
-      - db
-
-  db:
-    image: postgres:latest
-    environment:
-      POSTGRES_DB: your_database
-      POSTGRES_USER: your_user
-      POSTGRES_PASSWORD: your_password
-    ports:
-      - "5432:5432" 

build/docker-compose.yml

@@ -0,0 +1,28 @@
+version: '3.8'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: rosetta-server
+    ports:
+      - "${PORT:-3000}:${PORT:-3000}"
+    env_file:
+      - .env
+    depends_on:
+      - db
+
+  db:
+    image: postgres:latest
+    environment:
+      POSTGRES_DB: ${DB_NAME:-rosetta}
+      POSTGRES_USER: ${DB_USER:-rosetta}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-password}
+    ports:
+      - "5432:5432" 
+    volumes:
+      - db_data:/var/lib/postgresql/data
+
+volumes:
+  db_data: