diff --git a/.env.development b/.env.development index c89ea3c..84451cb 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,11 @@ TZ=Asia/Seoul # Uproad Folder UPLOAD_FOLDER=/Users/effects/Documents/GitHub/wacefems_upload +# ADMIN +ADMIN_PORT=3002 + # Frontend +APP_PORT=3003 NEXT_PUBLIC_API_URL=http://localhost:3001 NEXT_PUBLIC_MQTT_URL=ws://localhost:1883 NEXTAUTH_URL=http://localhost:3003 @@ -21,22 +25,25 @@ CORS_ORIGIN=* JWT_SECRET=wacefems-secret-work-in-progress-PPw09!keep JWT_EXPIRES_IN=1d +# REALTIME API +REALTIME_PORT=3004 + # Database -POSTGRES_HOST=postgres +POSTGRES_HOST=fems-postgres POSTGRES_PORT=5432 POSTGRES_DB=wacefems-database POSTGRES_USER=wacefems_database_user POSTGRES_PASSWORD=wacefems-pg-password-PPw09!keep # TimescaleDB -TIMESCALEDB_HOST=timescaledb -TIMESCALEDB_PORT=5432 +TIMESCALEDB_HOST=fems-timescaledb +TIMESCALEDB_PORT=5433 TIMESCALEDB_DB=fems_timeseries_da TIMESCALEDB_USER=wacefems-tsdb-user TIMESCALEDB_PASSWORD=wacefems-tsdb-password-PPw09!keep # Redis -REDIS_HOST=redis +REDIS_HOST=fems-redis REDIS_PORT=6379 REDIS_PASSWORD=wacefems-redis-password-PPw09!keep diff --git a/docker-compose.db.yml b/docker-compose.db.yml index 79e13fe..6fad05c 100644 --- a/docker-compose.db.yml +++ b/docker-compose.db.yml @@ -9,6 +9,8 @@ services: restart: unless-stopped env_file: - .env.${NODE_ENV:-development} + ports: + - "${POSTGRES_PORT}:5432" environment: - NODE_ENV=${NODE_ENV:-development} - LANG=en_US.utf8 @@ -47,7 +49,7 @@ services: env_file: - .env.${NODE_ENV:-development} ports: - - "${POSTGRES_PORT}:5442" + - "${TIMESCALEDB_PORT}:5442" environment: POSTGRES_DB: ${TIMESCALEDB_DB} POSTGRES_USER: ${TIMESCALEDB_USER} @@ -70,6 +72,8 @@ services: restart: unless-stopped env_file: - .env.${NODE_ENV:-development} + ports: + - "${REDIS_PORT}:6379" command: [ "redis-server",