From ea0ea5e7adb0cf735918330a52c1491b0b83281e Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Tue, 21 Oct 2025 04:45:37 +0500 Subject: [PATCH] modified: serv_nginx/docker-compose.yml new file: serv_nginx/keycloak/keycloak.conf fix space for kk --- serv_nginx/docker-compose.yml | 36 +++++++++++++++++++------------ serv_nginx/keycloak/keycloak.conf | 21 ++++++++++++++++++ 2 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 serv_nginx/keycloak/keycloak.conf diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index eebd991..3a96a96 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -162,42 +162,50 @@ services: container_name: keycloak restart: unless-stopped environment: + # Админ аккаунт KEYCLOAK_ADMIN: admin KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin} - KC_DB: postgres + + # БАЗА ДАННЫХ - КРИТИЧЕСКИ ВАЖНЫЕ ПЕРЕМЕННЫЕ + KC_DB: postgres KC_DB_URL: jdbc:postgresql://keycloak-db:5432/keycloak KC_DB_USERNAME: keycloak KC_DB_PASSWORD: ${KEYCLOAK_DB_PASSWORD:-keycloak} + + # Хост настройки KC_HOSTNAME: auth.yalarba.ru KC_HOSTNAME_STRICT: true KC_HOSTNAME_STRICT_HTTPS: true KC_HTTP_ENABLED: false KC_PROXY: edge + + # Дополнительные настройки KC_LOG_LEVEL: INFO KC_METRICS_ENABLED: true KC_HEALTH_ENABLED: true + + # Явно указываем использовать переменные окружения + KC_FEATURES: scripting command: - - start + - start - --optimized - --db=postgres - --db-url=jdbc:postgresql://keycloak-db:5432/keycloak - --db-username=keycloak - --db-password=${KEYCLOAK_DB_PASSWORD:-keycloak} - volumes: - - keycloak_data:/opt/keycloak/data - - ./keycloak/themes:/opt/keycloak/themes - - ./keycloak/providers:/opt/keycloak/providers - networks: - - keycloak-network - - internal - depends_on: + volumes: + - keycloak_data:/opt/keycloak/data + networks: + - keycloak-network + - internal + depends_on: keycloak-db: - condition: service_healthy + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/health/ready"] - interval: 30s - timeout: 10s - retries: 3 + interval: 30s + timeout: 10s + retries: 3 keycloak-db: image: postgres:15-alpine diff --git a/serv_nginx/keycloak/keycloak.conf b/serv_nginx/keycloak/keycloak.conf new file mode 100644 index 0000000..633019a --- /dev/null +++ b/serv_nginx/keycloak/keycloak.conf @@ -0,0 +1,21 @@ +# Database +db=postgres +db-url=jdbc:postgresql://keycloak-db:5432/keycloak +db-username=keycloak +db-password=${KEYCLOAK_DB_PASSWORD} + +# Hostname +hostname=auth.yalarba.ru +hostname-strict=true +hostname-strict-https=true +http-enabled=false +proxy=edge + +# Admin +admin=admin +admin-password=${KEYCLOAK_ADMIN_PASSWORD} + +# Features +health-enabled=true +metrics-enabled=true +log-level=INFO \ No newline at end of file