Merge branch 'main' into dev

docker-compose.yml

@@ -38,6 +38,27 @@ services:
     volumes:
       - ${DATADIR}/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom
 
+  postgres:
+    image: postgres
+    container_name: postgres
+    environment:
+      POSTGRES_DB: keycloak
+      POSTGRES_USER: keycloak
+      POSTGRES_PASSWORD: password
+
+  keycloak:
+    container_name: keycloak
+    build:
+      context: ./keycloak
+      args:
+        PG_KC_URL: postgres
+        PG_KC_USER: keycloak
+        PG_KC_PASS: password
+    ports:
+      - "0.0.0.0:8080:8080"
+    restart: always
+    command: --verbose start --optimized
+
   mariadb:
     container_name: mariadb
     image: mariadb:latest
@@ -127,4 +148,5 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - "6820:6820"
+      - "6820:6820"
+