From 5732c8fe57e9e5749358520781ec71754ca9245a Mon Sep 17 00:00:00 2001
From: Peter Selby <32845555+BrapiCoordinatorSelby@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:14:00 -0400
Subject: [PATCH] Update docker-compose.yaml

Match what is actually running on the server
---
 docker-compose.yaml | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index f24a7e4d..068a1e9e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,43 +1,40 @@
+version: '3'
+
 services:
   brapi-java-server-v1:
     image: brapicoordinatorselby/brapi-java-server:v1
     restart: unless-stopped
-    depends_on: 
+    depends_on:
       - postgres
     volumes:
       - /home/jenkins/brapi.org/brapi-test-server/properties/v1/application.properties:/home/brapi/properties/application.properties
   brapi-java-server-v2:
     image: brapicoordinatorselby/brapi-java-server:v2
     restart: unless-stopped
-    depends_on: 
+    depends_on:
       - postgres
     volumes:
       - /home/jenkins/brapi.org/brapi-test-server/properties/v2/application.properties:/home/brapi/properties/application.properties
   keycloak-brapi:
-    image: jboss/keycloak:12.0.1
+    image: brapicoordinatorselby/brapi-keycloak:latest
     restart: unless-stopped
-    depends_on: 
+    entrypoint: /opt/keycloak/bin/kc.sh start --optimized --proxy edge
+    depends_on:
       - postgres
-    volumes:
-      - /home/jenkins/brapi.org/brapi-test-server/keycloak/standalone.xml:/opt/jboss/keycloak/standalone/configuration/standalone.xml
     environment:
       - KEYCLOAK_USER
       - KEYCLOAK_PASSWORD
-      - DB_VENDOR
-      - DB_ADDR
-      - DB_DATABASE
-      - DB_USER
-      - DB_PASSWORD
-      - PROXY_ADDRESS_FORWARDING=true
+      - KC_HOSTNAME=auth.brapi.org
+      - KC_DB
+      - KC_DB_URL
+      - KC_DB_USERNAME
+      - KC_DB_PASSWORD
   postgres:
     image: postgres:13
     restart: unless-stopped
-    environment:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
     volumes:
       - /home/jenkins/brapi.org/brapi-test-server/data:/var/lib/postgresql/data
 networks:
     default:
-        external: true
-        name: brapi_net
+        external:
+            name: brapi_net