feat: add backend and replace PG_

betagouv · May 18, 2024 · 64c5ea2 · 64c5ea2
1 parent 5306aea
commit 64c5ea2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/.env.dist b/.env.dist
@@ -1,9 +1,9 @@
 # DOCKER-COMPOSE
-PG_PORT=
-PG_HOST=
-PG_USER=
-PG_PASSWORD=
-PG_DB=
+POSTGRES_PORT=
+POSTGRES_HOST=
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+POSTGRES_DB=
 
 PG_PROXY_PORT=
 PG_PROXY_PASSWORD=

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -10,24 +10,24 @@ services:
     depends_on:
       - electric
 
-  # backend:
-  #   image: ghcr.io/betagouv/compte-rendu-vif-backend:latest
-  #   restart: always
-  #   depends_on:
-  #     - electric
+  backend:
+    image: ghcr.io/betagouv/compte-rendu-vif-backend:latest
+    restart: always
+    depends_on:
+      - electric
 
   pg:
     image: postgres:14-alpine
     environment:
-      POSTGRES_PASSWORD: ${PG_PASSWORD}
-      POSTGRES_DB: ${PG_DB}
-      POSTGRES_USER: ${PG_USER}
-      POSTGRES_PORT: ${PG_PORT}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PORT: ${POSTGRES_PORT}
     command:
       - -c
       - wal_level=logical
     ports:
-      - ${PG_PORT}:5432
+      - ${POSTGRES_PORT}:5432
     restart: always
     volumes:
       - pg_data:/var/lib/postgresql/data
@@ -38,7 +38,7 @@ services:
     depends_on:
       - pg
     environment:
-      DATABASE_URL: postgresql://${PG_USER}:${PG_PASSWORD}@pg:${PG_PORT}/${PG_DB}
+      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@pg:${POSTGRES_PORT}/${POSTGRES_DB}
       AUTH_JWT_KEY: ${JWT_SECRET}
       PG_PROXY_PASSWORD: ${PG_PROXY_PASSWORD}
       PG_PROXY_PORT: ${PG_PROXY_PORT}

diff --git a/packages/backend/drizzle.config.ts b/packages/backend/drizzle.config.ts
@@ -2,11 +2,11 @@ import type { Config } from "drizzle-kit";
 import { ENV } from "./src/envVars";
 
 export const config = {
-  port: ENV.PG_PORT,
-  host: ENV.PG_HOST,
-  user: ENV.PG_USER,
-  password: ENV.PG_PASSWORD,
-  database: ENV.PG_DB,
+  port: ENV.POSTGRES_PORT,
+  host: ENV.POSTGRES_HOST,
+  user: ENV.POSTGRES_USER,
+  password: ENV.POSTGRES_PASSWORD,
+  database: ENV.POSTGRES_DB,
 };
 
 export const usersDatabaseUrl = `postgres://${config.user}:${config.password}@${config.host}:${config.port}/${config.database}`;

diff --git a/packages/backend/src/envVars.ts b/packages/backend/src/envVars.ts
@@ -7,11 +7,11 @@ expand(config({ path: "../../.env" }));
 const stringOrNumberAsNumber = z.string().or(z.number()).transform(Number);
 
 const envSchema = z.object({
-  PG_PORT: stringOrNumberAsNumber.default(5432),
-  PG_HOST: z.string(),
-  PG_USER: z.string(),
-  PG_PASSWORD: z.string(),
-  PG_DB: z.string(),
+  POSTGRES_PORT: stringOrNumberAsNumber.default(5432),
+  POSTGRES_HOST: z.string(),
+  POSTGRES_USER: z.string(),
+  POSTGRES_PASSWORD: z.string(),
+  POSTGRES_DB: z.string(),
   DATABASE_URL: z.string(),
   TOKEN_LIFETIME: z.string().default("1w"),
   JWT_SECRET: z.string(),