diff --git a/.env.sample. b/.env.sample. index fa965de0c1b2dcc71d5e62b7dce68ba13b2c57ac..db3db451df341d887b2293b5cf164d2c03af0e44 100644 --- a/.env.sample. +++ b/.env.sample. @@ -1,8 +1,16 @@ -COMPOSE_FILE=docker-compose.yml:traefik.yml +# Prod environnement +# COMPOSE_FILE=docker-compose.yml:prod.yml:traefik.yml + +# Dev environnement (for port forwarding) +COMPOSE_FILE=docker-compose.yml:dev.yml:ports.yml NAME=keycloak +# Set localhost if you are in local HOST=keycloak.FQDN +# In Dev environnement +PORT=8080 + # KeyCloak KC_ADMIN=admin KC_ADMIN_PASSWD= diff --git a/README.md b/README.md index d3acf6d2015ffb2a42d7762b7bc0c8d125b047dc..7789324751adfa9d8a0e68c59c6f065454fa0c8d 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ To secure the first application, folow [this tutorial](https://www.keycloak.org/ ### Prerequisites +set un dockerised [Dolibarr](https://gitlab.tetras-libre.fr/nocloud/docker/dolibarr) ### Set up To set up SSO with dolibarr you need folow this insctruction : diff --git a/dev.yml b/dev.yml new file mode 100644 index 0000000000000000000000000000000000000000..ac7663a21553355daa9fac451a16a060a1bddeca --- /dev/null +++ b/dev.yml @@ -0,0 +1,13 @@ +version: "3" + +services: + keycloak: + environment: + # cf https://github.com/keycloak/keycloak/issues/11170 for below variable + KC_HOSTNAME_URL: http://${HOST}:${PORT} + KC_HOSTNAME_ADMIN_URL: http://${HOST}:${PORT} + # http-enabled=true if traefik is use + command: + - "start-dev" + - "--import-realm" + - "--verbose" diff --git a/docker-compose.yml b/docker-compose.yml index e9f217e255f252ce8171f3f6e772871d7a3bd989..89d3ba9b2c1c2b4ff72e49d04b3cb089213c6411 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,19 +7,13 @@ services: environment: KEYCLOAK_ADMIN: ${KC_ADMIN} KEYCLOAK_ADMIN_PASSWORD: ${KC_ADMIN_PASSWD} - # cf https://github.com/keycloak/keycloak/issues/11170 for below variable - KC_HOSTNAME_URL: https://${HOST} - KC_HOSTNAME_ADMIN_URL: https://${HOST} - # Database + # Database KC_DB: mariadb KC_DB_SCHEMA: keycloak KC_DB_USERNAME: keycloak KC_DB_PASSWORD: ${MARIADB_PASS} KC_DB_URL_HOST: mariadb - restart: ${RESTART} - - command: ["start-dev", "--import-realm", "--verbose"] depends_on: - mariadb restart: ${RESTART} diff --git a/ports.yml b/ports.yml index fec42f4acbd8d98fe46ee84df8b857f80d214005..3ef59510ee1e44ed571576e76971d32dacaf78d0 100644 --- a/ports.yml +++ b/ports.yml @@ -3,4 +3,4 @@ version: "3" services: keycloak: ports: - - 8080:8080 + - "${PORT}:8080" diff --git a/prod.yml b/prod.yml new file mode 100644 index 0000000000000000000000000000000000000000..b7150165ba8c17e349ce96aebf6288dd856a1663 --- /dev/null +++ b/prod.yml @@ -0,0 +1,14 @@ +version: "3" + +services: + keycloak: + environment: + # cf https://github.com/keycloak/keycloak/issues/11170 for below variable + KC_HOSTNAME_URL: https://${HOST} + KC_HOSTNAME_ADMIN_URL: https://${HOST} + # http-enabled=true if traefik is use + command: + - "start" + - "--http-enabled=true" + - "--import-realm" + - "--verbose"