From c0c6dcd1ce136c1bf4592e62062f43c8f0290db4 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Sat, 26 Dec 2020 13:51:23 -0500
Subject: [PATCH 1/3] remove share context; moving to acs-share-base

---
 docker-compose.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 55a3bf9..e42df53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,9 +10,6 @@ services:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dshare.host=${PROXY_SHARE_HOST}
-                -Dshare.port=${PROXY_SHARE_PORT}
-                -Dshare.protocol=${PROXY_SHARE_PROTOCOL}
                 -Dalfresco.host=${PROXY_PLATFORM_HOST}
                 -Dalfresco.port=${PROXY_PLATFORM_PORT}
                 -Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL}

From 817b062dfddd1035aa68554f55065c042607c482 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Sat, 26 Dec 2020 13:54:31 -0500
Subject: [PATCH 2/3] merged platform/share into single proxy

---
 .env | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index c230e0c..402477f 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,5 @@
 EXTERNAL_RESOURCE_DIR=~
 
-PROXY_PLATFORM_PROTOCOL=http
-PROXY_PLATFORM_HOST=localhost
-PROXY_PLATFORM_PORT=8080
-PROXY_SHARE_PROTOCOL=http
-PROXY_SHARE_HOST=localhost
-PROXY_SHARE_PORT=8080
+PROXY_PROTOCOL=http
+PROXY_HOST=localhost
+PROXY_PORT=8080

From 1d5624496d7f6418dc99c30747e7e9d10d0c223d Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Sat, 26 Dec 2020 13:55:19 -0500
Subject: [PATCH 3/3] renamed proxy variables to match changes to proxy branch

---
 docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e42df53..287ccbe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,9 +10,9 @@ services:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dalfresco.host=${PROXY_PLATFORM_HOST}
-                -Dalfresco.port=${PROXY_PLATFORM_PORT}
-                -Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL}
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
                 "
         depends_on: