merged conflicts

This commit is contained in:
Grégory Lebreton 2025-10-27 18:22:51 +01:00
parent 585a2ae8e3
commit e8ac5cac40

View File

@ -2,9 +2,10 @@ services:
keycloak: keycloak:
build: build:
context: . context: .
dockerfile: Dockerfile.prod
dockerfile: ./tools/Dockerfile.prod.
# FOR IMPORTING REALM # FOR IMPORTING REALM
# dockerfile: Dockerfile.dev # dockerfile: ./tools/Dockerfile.dev
# command: ["start-dev", "--features=scripts"] # command: ["start-dev", "--features=scripts"]
container_name: ${KEYCLOAK_CONTAINER_NAME:-local-keycloak} container_name: ${KEYCLOAK_CONTAINER_NAME:-local-keycloak}
environment: environment: