change variables

.gitlab-ci.yml

@@ -4,16 +4,13 @@ services:
   - postgres:latest
 
 variables:
-  DB_NAME: $POSTGRES_DB
-  DB_USER: $POSTGRES_USER
-  DB_HOST: postgres
-  DB_DRIVER: postgres
-  DB_PASSWORD: $POSTGRES_PASSWORD
   TEST_DB_NAME: test
   POSTGRES_DB: $POSTGRES_DB
+  POSTGRES_HOST: postgres
   POSTGRES_USER: $POSTGRES_USER
   POSTGRES_PASSWORD: $POSTGRES_PASSWORD
   POSTGRES_HOST_AUTH_METHOD: trust
+  POSTGRES_DRIVER: postgres
   SKIP_PREFLIGHT_CHECK: "true"
   INITIAL_COORDINATOR_EMAIL: "initial@fahrtenbuch.example"
   INITIAL_COORDINATOR_PASSWORD: "password"

server/.env.example

 NODE_ENV=development
-DB_NAME=fahrtenbuch
-DB_USER=postgres
-DB_HOST=localhost
-DB_DRIVER=postgres
-DB_PASSWORD=postgres
+POSTGRES_DB=fahrtenbuch
+POSTGRES_USER=postgres
+POSTGRES_HOST=localhost
+POSTGRES_DRIVER=postgres
+POSTGRES_PASSWORD=postgres
 TEST_DB_NAME=test
 EMAIL_SERVER=smtp.example.com
 EMAIL_IS_TLS=false

server/src/config.ts

 import { Dialect } from "sequelize";
 
 const envVars = {
-  DB_NAME: process.env.DB_NAME,
-  DB_USER: process.env.DB_USER,
-  DB_HOST: process.env.DB_HOST,
-  DB_DRIVER: process.env.DB_DRIVER as Dialect,
-  DB_PASSWORD: process.env.DB_PASSWORD,
+  DB_NAME: process.env.POSTGRES_DB,
+  DB_USER: process.env.POSTGRES_USER,
+  DB_HOST: process.env.POSTGRES_HOST,
+  DB_DRIVER: process.env.POSTGRES_DRIVER as Dialect,
+  DB_PASSWORD: process.env.POSTGRES_PASSWORD,
   JWT_SECRET: process.env.JWT_SECRET,
   INITIAL_COORDINATOR_PASSWORD: process.env.INITIAL_COORDINATOR_PASSWORD,
   INITIAL_COORDINATOR_EMAIL: process.env.INITIAL_COORDINATOR_EMAIL,