From 8130a84841201a14772cdc7328c6842c3a468237 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Thu, 4 Jan 2024 15:46:14 -0800
Subject: [PATCH] #113 Implement keycloak-wip parallel to current prod

---
 fighter/config/keycloak/docker-compose.yml | 71 +++++++++++-----------
 fighter/config/keycloak/keycloak-wip.env   |  4 ++
 fighter/config/keycloak/keycloak.env       |  4 --
 3 files changed, 39 insertions(+), 40 deletions(-)
 create mode 100644 fighter/config/keycloak/keycloak-wip.env

diff --git a/fighter/config/keycloak/docker-compose.yml b/fighter/config/keycloak/docker-compose.yml
index cee8b91..24d51ea 100644
--- a/fighter/config/keycloak/docker-compose.yml
+++ b/fighter/config/keycloak/docker-compose.yml
@@ -1,30 +1,6 @@
 version: '3'
 
 services:
-#  keycloak-wip:
-#    #image: quay.io/keycloak/keycloak:19.0
-#    build:
-#      dockerfile: Dockerfile
-#      context: .
-#    container_name: keycloak_keycloak
-#    volumes:
-#      - $KEYCLOAK_DATA/import:/opt/keycloak/data/import
-#    networks:
-#      web:
-#        aliases:
-#          - keycloak
-#      keycloak:
-#    restart: "no"
-#    command: start --db=postgres --features=token-exchange  #--hostname-url=https://keycloak.jafner.net --proxy=passthrough
-#    env_file:
-#      - keycloak.env
-#      - keycloak_secrets.env
-#    labels:
-#      traefik.http.routers.keycloak.rule: Host(`keycloak.jafner.net`)
-#      traefik.http.routers.keycloak.tls.certresolver: lets-encrypt
-#      #traefik.http.routers.keycloak.middlewares: lan-only@file
-#      traefik.http.services.keycloak.loadbalancer.server.port: 8080
-  
   keycloak:
     image: quay.io/keycloak/keycloak:19.0
     container_name: keycloak_keycloak
@@ -89,20 +65,43 @@ services:
       - "traefik.http.routers.forwardauth-privileged.rule=Path(`/_oauth`)"
       - "traefik.http.routers.forwardauth-privileged.tls.certresolver=lets-encrypt"
   
-#  postgres:
-#    image: postgres:13
-#    container_name: keycloak_postgres
-#    networks:
-#      - keycloak
-#    env_file:
-#      - postgres_secrets.env
-#    volumes:
-#      - postgres_data:/var/lib/postgresql/data
+  keycloak-wip:
+    build:
+      dockerfile: Dockerfile
+      context: .
+    container_name: keycloak_keycloak-wip
+    volumes:
+      - $KEYCLOAK_DATA/import:/opt/keycloak/data/import
+    networks:
+      web:
+        aliases:
+          - keycloak
+      keycloak:
+    restart: "no"
+    command: start --help
+    env_file:
+      - keycloak-wip.env
+      - keycloak-wip_secrets.env
+    labels:
+      traefik.http.routers.keycloak.rule: Host(`keycloak-wip.jafner.net`)
+      traefik.http.routers.keycloak.tls.certresolver: lets-encrypt
+      traefik.http.routers.keycloak.middlewares: lan-only@file
+      traefik.http.services.keycloak.loadbalancer.server.port: 8080
+
+  postgres:
+    image: postgres:13
+    container_name: keycloak_postgres
+    networks:
+      - keycloak
+    env_file:
+      - postgres_secrets.env
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
 
 networks:
   web:
     external: true
-#  keycloak:
+  keycloak:
 
-#volumes:
-#  postgres_data:
\ No newline at end of file
+volumes:
+  postgres_data:
\ No newline at end of file
diff --git a/fighter/config/keycloak/keycloak-wip.env b/fighter/config/keycloak/keycloak-wip.env
new file mode 100644
index 0000000..9d274c3
--- /dev/null
+++ b/fighter/config/keycloak/keycloak-wip.env
@@ -0,0 +1,4 @@
+KC_DB=postgres
+KC_DB_URL=postgres
+KC_DB_USERNAME=keycloak
+KC_HOSTNAME=keycloak
\ No newline at end of file
diff --git a/fighter/config/keycloak/keycloak.env b/fighter/config/keycloak/keycloak.env
index c0f8375..fb08313 100644
--- a/fighter/config/keycloak/keycloak.env
+++ b/fighter/config/keycloak/keycloak.env
@@ -1,5 +1 @@
 KEYCLOAK_ADMIN="jafner"
-#KC_DB=postgres
-#KC_DB_URL=postgres
-#KC_DB_USERNAME=keycloak
-#KC_HOSTNAME=keycloak
\ No newline at end of file