fix: docker-compose

Makefile

@@ -5,7 +5,15 @@ watch:
 docker_build:
 	docker-compose up -d --build --wait
 
+
+## Для загрузки дампа
+## заходим в контейнер базы и пишем
+# pg_dump <name_db> -U <name_user> < reeq-db.dump
 #
+
+
+
+
 # Windows
 prisma_add_migrate :
 	docker-compose exec reeq-backend sh -c 'npx prisma migrate dev --name %migration_name%'

docker-compose.yml

@@ -8,11 +8,11 @@ services:
     volumes:
       - db_volume:/var/lib/postgresql/data
     ports:
-      - '5437:5432'
+      - "${DB_EXTERNAL_PORT}:${DB_PORT}"
     environment:
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_PASSWORD=${DB_PASSWORD}
+      - POSTGRES_USER=${DB_USER}
+      - POSTGRES_DB=${DB_NAME}
     networks:
       - reeq-network
   reeq-backend:
@@ -35,24 +35,11 @@ services:
       context: ./
       dockerfile: docker/Dockerfile
     ports:
-      - "${DOCKER_DEV_PORT}:${DOCKER_DEV_PORT}"
+      - "${PORT}:${PORT}"
     depends_on:
       - db
-    environment:
-      - DB_HOST=${DB_HOST}
-      - DB_USER=${DB_USER}
-      - DB_NAME=${DB_NAME}
-      - DB_PASSWORD=${DB_PASSWORD}
-      - DB_PORT=${DB_PORT}
-      - DOCKER_DEV_PORT=${DOCKER_DEV_PORT}
-      - DB_EXTERNAL_PORT=${DB_EXTERNAL_PORT}
-      - DB_SSLMODE=${DB_SSLMODE}
-      - PORT=${DOCKER_DEV_PORT}
-      - YANDEX_S3_ACCESS_KEY_ID=${YANDEX_S3_ACCESS_KEY_ID}
-      - YANDEX_S3_SECRET_KEY=${YANDEX_S3_SECRET_KEY}
-      - YANDEX_S3_ENDPOINT=${YANDEX_S3_ENDPOINT}
-      - YANDEX_S3_REGION=${YANDEX_S3_REGION}
-      - DATABASE_URL=${DATABASE_URL_DOCKER}
+    env_file:
+      - .env
     networks:
       - reeq-network
 volumes: