From 1929c94880a03902dccd302308ee66ac41b3aeeb Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Mon, 19 Apr 2021 08:51:12 -0400
Subject: [PATCH 1/3] configured aps for aims

---
 docker-compose.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index f48e896..6ce3837 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,8 @@ services:
             ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
             ACTIVITI_ES_REST_CLIENT_PORT: 9200
             ACTIVITI_ES_REST_CLIENT_SCHEMA: http
+            IDENTITY_SERVICE_ENABLED: "true"
+            IDENTITY_SERVICE_AUTH: $IDENTITY_SERVICE_BASEURL/auth
             JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
         depends_on:
             - postgres-aps
@@ -70,6 +72,22 @@ services:
         depends_on:
             - activiti-app
 
+    identity:
+        image: alfresco/alfresco-identity-service:1.3
+        user: jboss
+        environment:
+            KEYCLOAK_USER: admin
+            KEYCLOAK_PASSWORD: admin
+            KEYCLOAK_HOSTNAME: auth.example.org
+            KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
+            KEYCLOAK_STATISTICS: enabled
+        networks:
+            default:
+                aliases:
+                    - "auth.example.org"
+        volumes:
+            - ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
+
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:aps-aims
@@ -78,3 +96,4 @@ services:
         depends_on:
             - activiti-app
             - activiti-admin
+            - identity

From d7c28f9b6e1b5178d1606db5c278a1dce025a54f Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Tue, 22 Jun 2021 09:26:41 -0400
Subject: [PATCH 2/3] changed URLs to use split envvars

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a63c40d..4630e7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
             ACTIVITI_ES_REST_CLIENT_PORT: 9200
             ACTIVITI_ES_REST_CLIENT_SCHEMA: http
             IDENTITY_SERVICE_ENABLED: "true"
-            IDENTITY_SERVICE_AUTH: $IDENTITY_SERVICE_BASEURL/auth
+            IDENTITY_SERVICE_AUTH: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
             JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
         depends_on:
             - postgres-aps

From 97b9237171fc5ffd1f06a78e835a787892d78adf Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Tue, 6 Jul 2021 17:19:40 -0400
Subject: [PATCH 3/3] added activiti-app redirect URI

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4630e7a..2a766a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
             ACTIVITI_ES_REST_CLIENT_SCHEMA: http
             IDENTITY_SERVICE_ENABLED: "true"
             IDENTITY_SERVICE_AUTH: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
+            IDENTITY_SERVICE_CONTENT_SSO_REDIRECT_URI: ${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/activiti-app/app/rest/integration/sso/confirm-auth-request
             JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
         depends_on:
             - postgres-aps