modified: serv_nginx/docker-compose.yml
modified: serv_nginx/keycloak/Dockerfile modified: serv_nginx/keycloak/keycloak.conf one more try keycloak set
This commit is contained in:
@@ -165,17 +165,39 @@ services:
|
|||||||
container_name: keycloak
|
container_name: keycloak
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
|
# Database configuration
|
||||||
|
KC_DB: postgres
|
||||||
|
KC_DB_URL: jdbc:postgresql://keycloak-db:5432/keycloak
|
||||||
|
KC_DB_USERNAME: keycloak
|
||||||
|
KC_DB_PASSWORD: ${KEYCLOAK_DB_PASSWORD:-keycloak}
|
||||||
|
|
||||||
|
# Admin credentials
|
||||||
KEYCLOAK_ADMIN: admin
|
KEYCLOAK_ADMIN: admin
|
||||||
KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin}
|
KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin}
|
||||||
KC_DB_PASSWORD: ${KEYCLOAK_DB_PASSWORD:-keycloak}
|
|
||||||
# Убрать KC_HOSTNAME_URL - используем конфиг файл
|
# HTTP configuration
|
||||||
KC_HTTP_ENABLED: true
|
KC_HTTP_ENABLED: true
|
||||||
|
KC_HTTP_PORT: 8080
|
||||||
KC_HTTP_RELATIVE_PATH: /auth
|
KC_HTTP_RELATIVE_PATH: /auth
|
||||||
|
|
||||||
|
# Hostname configuration
|
||||||
|
KC_HOSTNAME: https://yalarba.ru
|
||||||
|
KC_HOSTNAME_PATH: /auth
|
||||||
KC_HOSTNAME_STRICT: true
|
KC_HOSTNAME_STRICT: true
|
||||||
KC_HOSTNAME_STRICT_HTTPS: true
|
KC_HOSTNAME_STRICT_HTTPS: true
|
||||||
|
KC_HOSTNAME_STRICT_BACKCHANNEL: false
|
||||||
|
|
||||||
|
# Proxy configuration
|
||||||
KC_PROXY: reencrypt
|
KC_PROXY: reencrypt
|
||||||
# Оптимизация для прода
|
|
||||||
JAVA_OPTS: "-Xms512m -Xmx1024m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true"
|
# Health checks
|
||||||
|
KC_HEALTH_ENABLED: true
|
||||||
|
|
||||||
|
# Features
|
||||||
|
KC_FEATURES: token-exchange,admin-fine-grained-authz
|
||||||
|
|
||||||
|
# Java options
|
||||||
|
JAVA_OPTS: "-Xms512m -Xmx1024m -Djava.net.preferIPv4Stack=true"
|
||||||
volumes:
|
volumes:
|
||||||
- keycloak_data:/opt/keycloak/data
|
- keycloak_data:/opt/keycloak/data
|
||||||
networks:
|
networks:
|
||||||
@@ -185,24 +207,6 @@ services:
|
|||||||
keycloak-db:
|
keycloak-db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
||||||
keycloak-db:
|
|
||||||
image: postgres:15-alpine
|
|
||||||
container_name: keycloak-db
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
POSTGRES_DB: keycloak
|
|
||||||
POSTGRES_USER: keycloak
|
|
||||||
POSTGRES_PASSWORD: ${KEYCLOAK_DB_PASSWORD:-keycloak}
|
|
||||||
volumes:
|
|
||||||
- keycloak_db_data:/var/lib/postgresql/data
|
|
||||||
networks:
|
|
||||||
- keycloak-network
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U keycloak"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 5
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
certbot_data:
|
certbot_data:
|
||||||
certbot_www:
|
certbot_www:
|
||||||
|
|||||||
@@ -1,22 +1,11 @@
|
|||||||
FROM quay.io/keycloak/keycloak:24.0.4 as builder
|
|
||||||
|
|
||||||
WORKDIR /opt/keycloak
|
|
||||||
|
|
||||||
# Включение необходимых фич
|
|
||||||
RUN /opt/keycloak/bin/kc.sh build --features=token-exchange,admin-fine-grained-authz
|
|
||||||
|
|
||||||
FROM quay.io/keycloak/keycloak:24.0.4
|
FROM quay.io/keycloak/keycloak:24.0.4
|
||||||
|
|
||||||
# Копируем собранный билд
|
|
||||||
COPY --from=builder /opt/keycloak/ /opt/keycloak/
|
|
||||||
|
|
||||||
WORKDIR /opt/keycloak
|
WORKDIR /opt/keycloak
|
||||||
|
|
||||||
# Копируем конфигурационный файл
|
# Копируем конфигурационный файл (опционально, если используете переменные окружения)
|
||||||
COPY keycloak.conf /opt/keycloak/conf/
|
# COPY keycloak.conf /opt/keycloak/conf/
|
||||||
|
|
||||||
# Экспортируем порт
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
# Команда запуска (оставляем стандартного пользователя)
|
# Запуск с явным указанием всех параметров через переменные окружения
|
||||||
ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--optimized"]
|
ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "start", "--optimized"]
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
# Database configuration
|
# Database configuration - ИСПРАВЛЕННЫЙ ФОРМАТ
|
||||||
db=postgres
|
db=postgres
|
||||||
db-url-host=keycloak-db
|
db-url=jdbc:postgresql://keycloak-db:5432/keycloak
|
||||||
db-url-port=5432
|
|
||||||
db-url-database=keycloak
|
|
||||||
db-username=keycloak
|
db-username=keycloak
|
||||||
db-password=${KC_DB_PASSWORD}
|
db-password=${KC_DB_PASSWORD}
|
||||||
|
|
||||||
@@ -33,4 +31,7 @@ health-enabled=true
|
|||||||
features=token-exchange,admin-fine-grained-authz
|
features=token-exchange,admin-fine-grained-authz
|
||||||
|
|
||||||
# Logging
|
# Logging
|
||||||
log-level=INFO
|
log-level=INFO
|
||||||
|
|
||||||
|
# Transaction recovery (для исправления предупреждения)
|
||||||
|
transaction-xa-enabled=true
|
||||||
Reference in New Issue
Block a user