Updated package

backend/package.json

@@ -35,22 +35,22 @@
     "jest": "^29.7.0",
     "nodemon": "^3.1.0",
     "prettier": "3.3.3",
+    "prisma": "^6.1.0",
     "ts-jest": "^29.1.3",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
     "typescript-eslint": "^7.8.0"
   },
   "dependencies": {
     "@bcgov/citz-imb-sso-express": "^1.0.2",
-    "@prisma/client": "^6.0.1",
+    "@prisma/client": "^6.1.0",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
     "morgan": "^1.10.0",
     "pg": "^8.11.5",
-    "prisma": "^6.0.1",
     "supertest": "^7.0.0",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0",

docker-compose.yml

@@ -1,15 +1,3 @@
-# Reusable vars
-x-var:
-  - &POSTGRES_USER
-    postgres
-
-# Postgres envars
-x-postgres-vars: &postgres-vars
-  POSTGRES_DATABASE: 'postgres'
-  POSTGRES_HOST: 'nr-nmp-db'
-  POSTGRES_PASSWORD: 'default'
-  POSTGRES_USER: *POSTGRES_USER
-
 name: nr-nmp
 services:
   database:
@@ -19,7 +7,7 @@ services:
     environment:
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB=${POSTGRES_DATABASE}
+      - POSTGRES_DB=${POSTGRES_DB}
     volumes:
       - ./database/postgres/data/db:/data/db
     ports:
@@ -47,13 +35,8 @@ services:
           path: ./backend/
           target: app
           ignore: [node_modules]
-    env_file: .env
-    environment:
-      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@nr-nmp-db:5432/${POSTGRES_DATABASE}
-      NODE_ENV: development
-      LOG_LEVEL: info
-      PORT: 3000
-      <<: *postgres-vars
+    env_file:
+      - .env
     healthcheck:
       test: curl localhost:3000/api/health | grep 'NMP API is healthy and ready!'
     ports: [3000:3000]