From 01217134e231208d0cfc7af5431cdd36ec83c713 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Mon, 8 Jan 2024 11:41:52 -0800
Subject: [PATCH] #113 Remove old keycloak install, copy new install over

---
 fighter/config/keycloak/docker-compose.yml | 54 +++++++---------------
 fighter/config/keycloak/keycloak-wip.env   |  6 ---
 fighter/config/keycloak/keycloak.env       |  9 +++-
 3 files changed, 24 insertions(+), 45 deletions(-)
 delete 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 da88d16..d07ea89 100644
--- a/fighter/config/keycloak/docker-compose.yml
+++ b/fighter/config/keycloak/docker-compose.yml
@@ -1,31 +1,6 @@
 version: '3'
 
 services:
-  keycloak:
-    image: quay.io/keycloak/keycloak:19.0
-    container_name: keycloak_keycloak
-    volumes:
-      - $KEYCLOAK_DATA:/opt/keycloak/data
-    networks:
-      web:
-        aliases:
-          - keycloak
-    restart: "no"
-    command: start-dev --hostname-url=https://keycloak.jafner.net --proxy=passthrough
-    healthcheck: 
-      test: ["CMD", "curl", "-f", "http://0.0.0.0:8080"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    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
-  
   forwardauth:
     image: mesosphere/traefik-forward-auth:3.1.0
     container_name: keycloak_forwardauth
@@ -65,30 +40,33 @@ services:
       - "traefik.http.routers.forwardauth-privileged.rule=Path(`/_oauth`)"
       - "traefik.http.routers.forwardauth-privileged.tls.certresolver=lets-encrypt"
   
-  keycloak-wip:
+  keycloak:
     image: quay.io/keycloak/keycloak:23.0
-    container_name: keycloak_keycloak-wip
-    volumes:
-      - $KEYCLOAK_DATA/import:/opt/keycloak/data/import
+    container_name: keycloak_keycloak
     networks:
       keycloak:
         aliases:
-          - keycloak-wip
+          - keycloak
       web:
         aliases:
-          - keycloak-wip
+          - keycloak
     restart: "no"
+    healthcheck:
+      test: ["CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/8080;echo -e \"GET /health/ready HTTP/1.1\r\nhost: http://localhost\r\nConnection: close\r\n\r\n\" >&3;grep \"HTTP/1.1 200 OK\" <&3"]
+      interval: 20s
+      timeout: 5s
+      retries: 5
     depends_on:
       - postgres
     command: start
     env_file:
-      - keycloak-wip.env
-      - keycloak-wip_secrets.env
+      - keycloak.env
+      - keycloak_secrets.env
     labels:
-      traefik.http.routers.keycloak-wip.rule: Host(`keycloak-wip.jafner.net`)
-      traefik.http.routers.keycloak-wip.tls.certresolver: lets-encrypt
-      traefik.http.routers.keycloak-wip.middlewares: keycloak-redirect
-      traefik.http.services.keycloak-wip.loadbalancer.server.port: 8080
+      traefik.http.routers.keycloak.rule: Host(`keycloak.jafner.net`)
+      traefik.http.routers.keycloak.tls.certresolver: lets-encrypt
+      traefik.http.routers.keycloak.middlewares: keycloak-redirect
+      traefik.http.services.keycloak.loadbalancer.server.port: 8080
       traefik.http.middlewares.keycloak-redirect.redirectregex.regex: ^https:\\/\\/([^\\//]+)\\/?$$"
       traefik.http.middlewares.keycloak-redirect.redirectregex.replacement: https://$$1/admin"
 
@@ -109,4 +87,4 @@ networks:
   keycloak:
 
 volumes:
-  postgres_data:
\ No newline at end of file
+  postgres_data:
diff --git a/fighter/config/keycloak/keycloak-wip.env b/fighter/config/keycloak/keycloak-wip.env
deleted file mode 100644
index 2a5fc2e..0000000
--- a/fighter/config/keycloak/keycloak-wip.env
+++ /dev/null
@@ -1,6 +0,0 @@
-KC_DB=postgres
-KC_DB_URL=jdbc:postgresql://postgres/keycloak
-KC_DB_USERNAME=keycloak
-KC_HOSTNAME_URL=https://keycloak-wip.jafner.net
-KC_PROXY=edge
-KEYCLOAK_ADMIN=Jafner
\ No newline at end of file
diff --git a/fighter/config/keycloak/keycloak.env b/fighter/config/keycloak/keycloak.env
index fb08313..8176ae5 100644
--- a/fighter/config/keycloak/keycloak.env
+++ b/fighter/config/keycloak/keycloak.env
@@ -1 +1,8 @@
-KEYCLOAK_ADMIN="jafner"
+KC_DB=postgres
+KC_DB_URL=jdbc:postgresql://postgres/keycloak
+KC_DB_USERNAME=keycloak
+KC_HOSTNAME_URL=https://keycloak.jafner.net
+KC_PROXY=edge
+KC_HEALTH_ENABLED=true
+KC_METRICS_ENABLED=true
+KEYCLOAK_ADMIN=Jafner