diff --git a/configs/.env.example b/configs/.env.example index 1a44d8a..7383088 100644 --- a/configs/.env.example +++ b/configs/.env.example @@ -28,6 +28,8 @@ EMAIL_PASSWORD="change_me" FRONT_HOST="change_me" FRONT_PORT=change_me #int -BACKEND_PORT=change_me #int +VITE_BACKEND_HOST="change_me" +VITE_BACKEND_PORT="change_me" + PROD_MODE=bool \ No newline at end of file diff --git a/docker/compose-dev.yaml b/docker/compose-dev.yaml index 48f15c4..67317b1 100644 --- a/docker/compose-dev.yaml +++ b/docker/compose-dev.yaml @@ -50,7 +50,7 @@ services: rabbitmq: condition: service_healthy ports: - - "${BACKEND_PORT}:8000" + - "${VITE_BACKEND_PORT}:8000" entrypoint: ["./entrypoint.sh", "--dev"] backend-prod: @@ -93,7 +93,7 @@ services: rabbitmq: condition: service_healthy ports: - - "${BACKEND_PORT}:8000" + - "${VITE_BACKEND_PORT}:8000" daemons: profiles: ["prod", "dev"] @@ -213,8 +213,8 @@ services: source: ../frontend/vite.config.ts target: /home/excel-project/vite.config.ts - type: bind - source: ../frontend/configs - target: /home/excel-project/configs + source: ../configs + target: /home/configs ports: - "${FRONT_PORT}:5173" networks: @@ -232,7 +232,7 @@ services: target: frontend_prod environment: - BACKEND_HOST=backend-prod - - BACKEND_PORT=${BACKEND_PORT} + - BACKEND_PORT=${VITE_BACKEND_PORT} init: true ipc: private ports: diff --git a/frontend/configs/.env.example b/frontend/configs/.env.example deleted file mode 100644 index 5996ad1..0000000 --- a/frontend/configs/.env.example +++ /dev/null @@ -1,2 +0,0 @@ -VITE_BACKEND_HOST="change_me" -VITE_BACKEND_PORT="change_me" \ No newline at end of file diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 20b9100..4d65354 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -4,5 +4,5 @@ import { defineConfig } from 'vite' // https://vite.dev/config/ export default defineConfig({ plugins: [react()], - envDir:"./configs", + envDir:"../configs", }) diff --git a/src/models/configs_read/env.py b/src/models/configs_read/env.py index 2fb8f1f..71723e9 100644 --- a/src/models/configs_read/env.py +++ b/src/models/configs_read/env.py @@ -33,7 +33,9 @@ class Env(Base): FRONT_HOST:str FRONT_PORT:int - BACKEND_PORT:int + + VITE_BACKEND_HOST:str + VITE_BACKEND_PORT:str PROD_MODE:bool