From c38c6c550d490d41416949e3072b3cf04becd5d4 Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Thu, 23 May 2024 13:25:51 +0200
Subject: [PATCH] separate dev and prod environnement
Closes #4
---
.env.sample. | 10 +++++++++-
README.md | 1 +
dev.yml | 13 +++++++++++++
docker-compose.yml | 8 +-------
ports.yml | 2 +-
prod.yml | 14 ++++++++++++++
6 files changed, 39 insertions(+), 9 deletions(-)
create mode 100644 dev.yml
create mode 100644 prod.yml
diff --git a/.env.sample. b/.env.sample.
index fa965de..db3db45 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 d3acf6d..7789324 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 0000000..ac7663a
--- /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 e9f217e..89d3ba9 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 fec42f4..3ef5951 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 0000000..b715016
--- /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"
--
GitLab