Bug/docker env (#3)

* chore(docker): docker bug env

* fix(docker_env): dockerfile.development read wrong env file

apps/backend/.env.example

@@ -1,6 +1,8 @@
 POSTGRES_USER="example_user"
 POSTGRES_PASSWORD="example_password"
 
+POSTGRES_DB="example_db"
+
 DATABASE_URL="postgresql://example_user:example_password@localhost:5432/example_db?schema=public"
 
 PORT=123

apps/backend/Dockerfile

@@ -2,4 +2,4 @@ FROM postgres:15
 
 ENV POSTGRES_USER=${POSTGRES_USER}
 ENV POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-ENV POSTGRES_DB=devix_admin
+ENV POSTGRES_DB=${POSTGRES_DB}

apps/backend/Dockerfile.development

@@ -0,0 +1,9 @@
+FROM postgres:15
+
+ARG POSTGRES_USER
+ARG POSTGRES_PASSWORD
+ARG POSTGRES_DB
+
+ENV POSTGRES_USER=${POSTGRES_USER}
+ENV POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+ENV POSTGRES_DB=${POSTGRES_DB}

apps/backend/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   devixid:
     build:
@@ -9,13 +7,21 @@ services:
     ports:
       - "5434:5432"
     environment:
-      POSTGRES_DB: devix_admin
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    env_file:
+      - .env
   devixid_dev:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.development
+      args:
+        POSTGRES_USER: ${POSTGRES_USER}
+        POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+        POSTGRES_DB: ${POSTGRES_DB}
     image: devixid_dev
+    env_file:
+      - .env.development
     ports:
       - "5435:5432"
-    environment:
-      POSTGRES_DB: devix_admin_dev

apps/backend/package.json

@@ -29,7 +29,7 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "dotenv -e .env.test -- jest --config --watch --no-cache ./test/jest-e2e.json",
-    "pretest:e2e": "yarn db:test:restart"
+    "pretest:e2e": "pnpm db:test:restart"
   },
   "lint-staged": {
     "**/*.{html,css,scss,less,json,js,jsx,ts,tsx,md,mdx}\"": [

apps/backend/prisma/schema.prisma

@@ -10,6 +10,18 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
+model Portfolio {
+  id          Int      @id @default(autoincrement())
+  title       String
+  description String
+  url         String
+  image       String   @db.VarChar(255)
+  keywords    String[]
+  uploaderId  Int
+
+  @@index([title, keywords])
+}
+
 model User {
   id        Int      @id @default(autoincrement())
   createdAt DateTime @default(now())
@@ -18,8 +30,14 @@ model User {
   email String @unique
   hash  String
 
-  firstName String?
-  lastName  String?
+  userName String?
+  fullName String?
+  role     UserRole @default(ADMIN)
 
   @@map("users")
 }
+
+enum UserRole {
+  ADMIN
+  SUPER_ADMIN
+}