Преглед на файлове

feat: Set up and configured Kimai with Apache, added necessary Doctrine bundles

mathias.riechsteiner преди 1 година
родител
ревизия
c52b40bc39
променени са 1 файла, в които са добавени 48 реда и са изтрити 3 реда
  1. 48 3
      src/docker/docker-compose.yml

+ 48 - 3
src/docker/docker-compose.yml

@@ -101,14 +101,19 @@ services:
       - automate-network      
 
   kimai:
-    image: 'kimai/kimai2:latest'
+    image: 'kimai/kimai2:apache'
     container_name: 'kimai'
     restart: unless-stopped
     environment:
       - APP_ENV=prod
-      - DATABASE_URL=mysql://${KIMAI_DB_USER}:${KIMAI_DB_PASSWORD}@kimai-db/${KIMAI_DB_NAME}
+      - DATABASE_URL=mysql://${KIMAI_DB_USER}:${KIMAI_DB_PASSWORD}@${KIMAI_DB_HOST}/${KIMAI_DB_NAME}
+      - TRUSTED_PROXIES=nginx,localhost,127.0.0.1  # Vertrauenswürdige Proxies für Reverse Proxy Setup
+      - ADMINMAIL=${KIMAI_ADMIN_EMAIL}            # E-Mail für den Admin
+      - ADMINPASS=${KIMAI_ADMIN_PASSWORD}         # Passwort für den Admin
+      - TIMEZONE=Europe/Berlin                    # Zeitzone für Kimai
+      - APP_SECRET=${KIMAI_APP_SECRET}            # Sicherer Secret Key für die Anwendung
     ports:
-      - "8090:8001"
+      - "8001:8001"
     volumes:
       - data:/opt/kimai/var/data
       - plugins:/opt/kimai/var/plugins
@@ -166,6 +171,46 @@ services:
       - POSTGRES_PASSWORD=${N8N_DB_PASSWORD}
     volumes:
       - ../data/n8n_db:/var/lib/postgresql/data
+    networks:
+      - automate-network
+
+  keycloak:
+    image: 'quay.io/keycloak/keycloak:latest'
+    container_name: 'keycloak'
+    restart: unless-stopped
+    environment:
+      - DB_VENDOR=postgres
+      - DB_ADDR=keycloak-db
+      - DB_DATABASE=${KEYCLOAK_DB_NAME}
+      - DB_USER=${KEYCLOAK_DB_USER}
+      - DB_PASSWORD=${KEYCLOAK_DB_PASSWORD}
+      - KEYCLOAK_ADMIN=${KEYCLOAK_ADMIN_USER}
+      - KEYCLOAK_ADMIN_PASSWORD=${KEYCLOAK_ADMIN_PASSWORD}
+      - KC_HOSTNAME=auth.mrx8086.com
+      - KC_HOSTNAME_STRICT_HTTPS=true
+      - KC_HTTPS_CERTIFICATE_FILE=/etc/x509/https/fullchain.pem
+      - KC_HTTPS_CERTIFICATE_KEY_FILE=/etc/x509/https/privkey.pem
+    ports:
+      - "8443:8443"  # HTTPS Port für Keycloak
+    volumes:
+      - ../configs/certs/mrx8086.com:/etc/x509/https  # Zertifikate mounten
+    command:
+      - start-dev
+    depends_on:
+      - keycloak-db
+    networks:
+      - automate-network
+
+  keycloak-db:
+    image: 'postgres:13'
+    container_name: 'keycloak-db'
+    restart: unless-stopped
+    environment:
+      - POSTGRES_DB=${KEYCLOAK_DB_NAME}
+      - POSTGRES_USER=${KEYCLOAK_DB_USER}
+      - POSTGRES_PASSWORD=${KEYCLOAK_DB_PASSWORD}
+    volumes:
+      - ../data/keycloak_db:/var/lib/postgresql/data
     networks:
       - automate-network