Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env

.env

@@ -2,14 +2,4 @@ VITE_BASE_URL=http://localhost:3000
 VITE_YANDEX_MAPS_KEY=13f4c06b-cb7e-4eeb-81f1-af52f12587b2
 SMTP_USER=rentalservicekg@yandex.ru
 SMTP_APP_PASSWORD=uljislsoihthciju
-
-
-# This was inserted by `prisma init`:
-# Environment variables declared in this file are NOT automatically loaded by Prisma.
-# Please add `import "dotenv/config";` to your `prisma.config.ts` file, or use the Prisma CLI with Bun
-# to load environment variables from .env files: https://pris.ly/prisma-config-env-vars.
-
-# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
-# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
-
 DATABASE_URL="file:./database.db"

.env.developer

@@ -1,2 +1,5 @@
 VITE_BASE_URL=http://localhost:3000
-VITE_YANDEX_MAPS_KEY=13f4c06b-cb7e-4eeb-81f1-af52f12587b2
+VITE_YANDEX_MAPS_KEY=13f4c06b-cb7e-4eeb-81f1-af52f12587b2
+SMTP_USER=rentalservicekg@yandex.ru
+SMTP_APP_PASSWORD=uljislsoihthciju
+DATABASE_URL="file:./database.db"

Dockerfile

@@ -15,6 +15,7 @@ ENV VITE_BASE_URL=https://rental.koptilnya.xyz
 ENV VITE_YANDEX_MAPS_KEY=13f4c06b-cb7e-4eeb-81f1-af52f12587b2
 ENV SMTP_USER=rentalservicekg@yandex.ru
 ENV SMTP_APP_PASSWORD=uljislsoihthciju
+ENV DATABASE_URL="file:./database.db"
 
 
 EXPOSE 80