diff --git a/backend/.env.development.example b/backend/.env.development.example index bf2a4927..58694df4 100644 --- a/backend/.env.development.example +++ b/backend/.env.development.example @@ -1,4 +1,4 @@ -PORT=3000 +DWENGO_PORT=3000 DWENGO_DB_HOST=localhost DWENGO_DB_PORT=5431 DWENGO_DB_USERNAME=postgres diff --git a/backend/src/app.ts b/backend/src/app.ts index ecee4944..194bf61f 100644 --- a/backend/src/app.ts +++ b/backend/src/app.ts @@ -1,8 +1,9 @@ import express, { Express, Response } from 'express'; import { initORM } from './orm.js'; +import {EnvVars, getNumericEnvVar} from "./util/envvars.js"; const app: Express = express(); -const port: string | number = process.env.PORT || 3000; +const port: string | number = getNumericEnvVar(EnvVars.Port); // TODO Replace with Express routes app.get('/', (_, res: Response) => { diff --git a/backend/src/util/envvars.ts b/backend/src/util/envvars.ts index 279a4bb5..4aa14cb1 100644 --- a/backend/src/util/envvars.ts +++ b/backend/src/util/envvars.ts @@ -4,6 +4,7 @@ const DB_PREFIX = PREFIX + 'DB_'; type EnvVar = { key: string; required?: boolean; defaultValue?: any }; export const EnvVars: { [key: string]: EnvVar } = { + Port: { key: PREFIX + "PORT", defaultValue: 3000 }, DbHost: { key: DB_PREFIX + 'HOST', required: true }, DbPort: { key: DB_PREFIX + 'PORT', defaultValue: 5432 }, DbName: { key: DB_PREFIX + 'NAME', defaultValue: 'dwengo' }, diff --git a/docker-compose.yml b/docker-compose.yml index 88b9f491..c5230d7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,6 @@ services: - "5431:5432" volumes: - postgres_data:/var/lib/postgresql/data - - ./backend/config/db/init.sql:/docker-entrypoint-initdb.d/init.sql volumes: postgres_data: