diff --git a/serv_nginx/Makefile b/serv_nginx/Makefile index 52cc055..ee27666 100644 --- a/serv_nginx/Makefile +++ b/serv_nginx/Makefile @@ -23,15 +23,6 @@ api_bb_logs: restart: docker compose down && docker compose up -d -stop_nginx: - docker compose down nginx - -build_nginx: - docker compose build nginx --no-cache - -run_nginx: stop_nginx build_nginx - docker compose up nginx -d - npm_clean: npm cache clean --force diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index d2b28fc..d53c8b0 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -68,7 +68,15 @@ services: networks: - app-network healthcheck: - test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/health"] + test: + [ + "CMD", + "wget", + "--no-verbose", + "--tries=1", + "--spider", + "http://localhost:8080/health", + ] interval: 30s timeout: 10s retries: 3 @@ -118,7 +126,15 @@ services: networks: - bb-network healthcheck: - test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/api/health"] + test: + [ + "CMD", + "wget", + "--no-verbose", + "--tries=1", + "--spider", + "http://localhost:8080/api/health", + ] interval: 30s timeout: 10s retries: 3 @@ -149,32 +165,36 @@ services: # 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} - + # Настройки хоста и 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 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 @@ -228,4 +248,4 @@ networks: bb-network: driver: bridge keycloak-network: - driver: bridge \ No newline at end of file + driver: bridge