From 6fa67be98716a6d597a85276a8a9319eb2ed7ac5 Mon Sep 17 00:00:00 2001
From: leonnicolas <leonloechner@gmx.de>
Date: Sat, 12 Dec 2020 19:45:56 +0100
Subject: [PATCH] fix env var for user server

---
 docker-compose.yml | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ab78d00..05d7c4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,64 +2,51 @@ version: '2.0'
 services:
   db:
     image: postgres:12.4-alpine
-    ports:
-      - "8001:5432"
     restart: unless-stopped
     volumes:
       - database-volume:/var/lib/postgresql/data
       - ./init-users.sh:/docker-entrypoint-initdb.d/init-users.sh
     environment:
-      - POSTGRES_PASSWORD=password
+      - POSTGRES_PASSWORD=postgres
   user-management:
     image: flotte-docker-registry.spdns.org/flotte-user-managment
-    ports:
-      - "5000:5000"
-      - "8080:8080"
     links:
       - "db:database"
-    mem_limit: 2000000000
+    mem_limit: "1000000000"
     restart: unless-stopped
     environment:
-      - DATABASE_URL=postgres://fuser_management:passwordofuserserver@database/user_management
+      - POSTGRES_CONNECTION_URL=postgres://fuser_management:passwordofuserserver@database/user_management
       - RUST_LOG=trace
       - HTTP_SERVER_ADDRESS=0.0.0.0:8080
       - RPC_SERVER_ADDRESS=0.0.0.0:5000
       - ENABLE_CORS=true
   api-server:
     image: flotte-docker-registry.spdns.org/apollo-server
-    ports:
-      - "4000:4000"
     links:
       - "db:database"
       - "user-management:um"
-    mem_limit: 1000000000
     restart: unless-stopped
     environment:
       - RPC_HOST=um:5000
-      - POSTGRES_CONNECTION_URL=postgres://fapi:passwordofapiserver@database/flotte_api
+      - DATABASE_URL=postgres://fapi:passwordofapiserver@database/flotte_api
       - NODE_ENV=nodevelop
   frontend:
       image: flotte-docker-registry.spdns.org/frontend-server
-      ports:
-        - "8081:8080"
-    mem_limit: 100000000
-    restart: unless-stopped
   proxy:
-    image: staticfloat/nginx-certbot:v1.1
+    image: staticfloat/nginx-certbot
     links:
       - "frontend:frontend"
       - "api-server:api-server"
       - "user-management:user-management"
-    mem_limit: 1000000000
     restart: unless-stopped
     environment:
-      CERTBOT_EMAIL: "youremail@example.de"
+      CERTBOT_EMAIL: "your_email@mail.com"
     ports:
       - "80:80"
       - "443:443"
     volumes:
       - ./conf.d:/etc/nginx/user.conf.d:ro
-      - letsencrypt:/etc/letsencrypt
+      - ./certbot_extra_domains:/etc/nginx/certbot/extra_domains:ro
 volumes:
   database-volume: {}
   letsencrypt: