diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index 3a96a96..6d2849d 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -157,55 +157,27 @@ services: timeout: 10s retries: 5 + keycloak: image: quay.io/keycloak/keycloak:22.0.0 container_name: keycloak restart: unless-stopped environment: - # Админ аккаунт KEYCLOAK_ADMIN: admin KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin} - - # БАЗА ДАННЫХ - КРИТИЧЕСКИ ВАЖНЫЕ ПЕРЕМЕННЫЕ - 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 - - --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 - networks: - - keycloak-network - - internal - depends_on: + volumes: + - keycloak_data:/opt/keycloak/data + - ./keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf + networks: + - keycloak-network + - internal + depends_on: keycloak-db: - condition: service_healthy - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/health/ready"] - interval: 30s - timeout: 10s - retries: 3 + condition: service_healthy + command: + - start + - --optimized keycloak-db: image: postgres:15-alpine