diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index d53c8b0..6ea27e6 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -157,64 +157,60 @@ services: timeout: 10s retries: 5 - keycloak: - image: quay.io/keycloak/keycloak:22.0.0 - container_name: keycloak - restart: unless-stopped - environment: - # Keycloak администратор - KEYCLOAK_ADMIN: admin - KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin} +keycloak: + image: quay.io/keycloak/keycloak:22.0.0 + container_name: keycloak + restart: unless-stopped + environment: + # Keycloak администратор + 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_DB: postgres + KC_DB_URL: jdbc:postgresql://keycloak-db:5432/keycloak + KC_DB_USERNAME: keycloak + KC_DB_PASSWORD: ${KEYCLOAK_DB_PASSWORD:-keycloak} - # Настройки хоста и HTTPS - KC_HOSTNAME: auth.yalarba.ru - KC_HOSTNAME_STRICT: true - KC_HOSTNAME_STRICT_HTTPS: true - KC_HTTP_ENABLED: false - KC_PROXY: edge + # Настройки хоста и HTTPS + KC_HOSTNAME: auth.yalarba.ru + KC_HOSTNAME_STRICT: true + KC_HOSTNAME_STRICT_HTTPS: true + KC_HTTP_ENABLED: false + KC_PROXY: edge - # Настройки для работы за reverse proxy - KC_PROXY_HEADERS: xforwarded + # Дополнительные опции + KC_LOG_LEVEL: INFO + KC_METRICS_ENABLED: true + KC_HEALTH_ENABLED: true - # Дополнительные опции - KC_LOG_LEVEL: INFO - KC_METRICS_ENABLED: true - - # Команды для начальной настройки - KC_HEALTH_ENABLED: true - 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 - - ./keycloak/themes:/opt/keycloak/themes - - ./keycloak/providers:/opt/keycloak/providers - 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 + # Отключаем импорт по умолчанию + KC_IMPORT: false + command: + - start + - --optimized + volumes: + - keycloak_data:/opt/keycloak/data + - ./keycloak/themes:/opt/keycloak/themes + - ./keycloak/providers:/opt/keycloak/providers + 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 keycloak-db: image: postgres:15-alpine container_name: keycloak-db restart: unless-stopped + ports: + - "5434:5432" environment: POSTGRES_DB: keycloak POSTGRES_USER: keycloak