Merge branch 'dev' into feature-user-auth

2026-09-04 08:36:06 +02:00 · 2021-11-17 15:36:09 +01:00
parent 6c535b16d1 8f85f062d7
commit 62d468c7a5
4 changed files with 55 additions and 7 deletions
@@ -14,15 +14,20 @@ services:
    image: postgres
    restart: always
    environment:
+      - POSTGRES_USER=server
      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
-    ports:
-      - 5432:5432
    container_name: "postgres"
  redis:
    image: redis
    restart: always
-
-  #server:
-  #        build: .
-  #        restart: always
-  #        container_name: "server"
+  server:
+    build: .
+    restart: always
+    container_name: "server"
+    ports:
+      - ${PORT:-3000}:${PORT:-3000}
+    environment:
+      - PORT=${PORT:-3000}
+      - DATABASE_URL=postgresql://server:${DATABASE_PASSWORD}@postgres:5432/management?schema=public
+      - DATABASE_USER=server
+      - DATABASE_PASSWORD=${DATABASE_PASSWORD}