From c294e9b3e70fcd56033021acf521a75a7c2cadc5 Mon Sep 17 00:00:00 2001
From: Angel Borroy <angel.borroy@alfresco.com>
Date: Thu, 8 Aug 2019 16:14:05 +0200
Subject: [PATCH] Including proxy to 6.1 CE to server both alfresco and share
 web apps in port 8080

---
 .../README.md                                 | 29 +++++++++----------
 .../generators/app/templates/6.1/.env         |  1 +
 .../app/templates/6.1/docker-compose-ce.yml   | 17 +++++++----
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/e2e-test/generator-alfresco-docker-compose/README.md b/e2e-test/generator-alfresco-docker-compose/README.md
index 4014c7d1d..e78cfd477 100644
--- a/e2e-test/generator-alfresco-docker-compose/README.md
+++ b/e2e-test/generator-alfresco-docker-compose/README.md
@@ -174,20 +174,17 @@ If *Sharding* is selected, a default `share-config-custom-dev.xml` file with req
 
 ## Configuration catalog
 
-| Version    | Comms | Replication | Sharding | Explicit | Insight | Zeppelin |
-| -          | -     | -           | -        | -        | -       | -        |
-| community  | http  | -           | -        | -        | x       | x        |
-| community  | http  | true        | x        | x        | x       | x        |
-| community  | http  | false       | true     | false    | x       | x        |
-| community  | http  | false       | true     | true     | x       | x        |
-| community  | https | x           | -        | -        | x       | x        |
-| enterprise | http  | -           | -        | -        | (*)     | (*)      |
-| enterprise | http  | true        | x        | x        | (*)     | (*)      |
-| enterprise | http  | false       | true     | false    | (*)     | (*)      |
-| enterprise | http  | false       | true     | true     | (*)     | (*)      |
-| enterprise | https | x           | -        | -        | (*)     | (*)      |
-| enterprise | https | x           | true     | false    | (*)     | (*)      |
-| enterprise | https | x           | true     | true     | (*)     | (*)      |
+| Version    | Comms | Replication | Sharding | Insight | Zeppelin |
+| -          | -     | -           | -        | -       | -        |
+| community  | http  | -           | x        | x       | x        |
+| community  | http  | true        | x        | x       | x        |
+| community  | https | x           | x        | x       | x        |
+| enterprise | http  | -           | -        | (*)     | (*)      |
+| enterprise | http  | true        | false    | (*)     | (*)      |
+| enterprise | http  | false       | true     | (*)     | (*)      |
+| enterprise | https | x           | -        | (*)     | (*)      |
+| enterprise | https | x           | true     | (*)     | (*)      |
+| enterprise | https | x           | true     | (*)     | (*)      |
 
 Both `community` and `enterprise` ACS deployments can be used with the same options, but `enterprise` may also use Insight Engine (replacing Search Services) and Insight Zeppelin services.
 
@@ -231,7 +228,7 @@ $ docker-compose down
 
 http://localhost:8080/share
 
-http://localhost:8082/alfresco
+http://localhost:8080/alfresco
 
 http://localhost:8083/solr
 
@@ -244,7 +241,7 @@ http://localhost:8084/solr
 
 http://localhost:8080/share
 
-http://localhost:8082/alfresco
+http://localhost:8080/alfresco
 
 https://localhost:8443/alfresco
 
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env
index 969be3121..5b9a74a4c 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env
@@ -16,5 +16,6 @@ SHARED_FILE_STORE_TAG=0.5.3
 ACTIVE_MQ_TAG=5.15.8
 DIGITAL_WORKSPACE_TAG=1.1.0
 ACS_NGINX_TAG=3.0.0
+ACS_COMMUNITY_NGINX_TAG=1.0.0
 SEARCH_TAG=latest
 ZEPPELIN_TAG=latest
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
index 6b3d721b3..24f66e6df 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
@@ -32,10 +32,8 @@ services:
                 -Ddeployment.method=DOCKER_COMPOSE
                 -Dcsrf.filter.enabled=false
                 -Dalfresco.restApi.basicAuthScheme=true
-                -Xms1500m -Xmx1500m
-                "
+                " <% if (httpMode == 'https') { %>
         ports:
-            - 8082:8080 <% if (httpMode == 'https') { %>
             - 8443:8443
         volumes:
             - ./keystores/alfresco:/usr/local/tomcat/alf_data/keystore <% } %>
@@ -140,8 +138,6 @@ services:
                 -Dalfresco.context=alfresco
                 -Dalfresco.protocol=http
                 "
-        ports:
-            - 8080:8080
 
     postgres:
         image: postgres:${POSTGRES_TAG}
@@ -162,3 +158,14 @@ services:
             - 5672:5672 # AMQP
             - 61616:61616 # OpenWire
             - 61613:61613 # STOMP
+
+    proxy:
+        image: alfresco/acs-community-ngnix:${ACS_COMMUNITY_NGINX_TAG}
+        mem_limit: 128m
+        depends_on:
+            - alfresco
+        ports:
+            - 8080:8080
+        links:
+            - alfresco
+            - share
\ No newline at end of file