Merge branch 'acs-frontend-community.acs-backend-community' into acs-frontend-community-persist.acs-frontend-community

docker-compose.yml

@@ -17,6 +17,8 @@ services:
                 -Dsolr.host=search
                 -Dsolr.port=8983
                 -Dsolr.secureComms=none
+                -Dshare.host=localhost
+                -Dshare.port=8080
                 -Dalfresco.host=localhost
                 -Dalfresco.port=8080
                 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
@@ -46,6 +48,16 @@ services:
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
     
+    share:
+        image: alfresco/alfresco-share:6.2.2
+        mem_limit: 512m
+        environment:
+            REPO_HOST: "platform"
+            JAVA_OPTS: "
+                -Dalfresco.host=localhost
+                -Dalfresco.port=8080
+                "
+    
     postgres-acs:
         image: postgres:11.7
         mem_limit: 512m
@@ -78,11 +90,12 @@ services:
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:acs-share
         ports:
             - 8080:8080
         depends_on:
             - platform
+            - share
 
 volumes:
     acsbin-volume:

nginx-ingress/entrypoint.sh

@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
+if [[ $ACS_SHARE_URL ]]; then
+  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
+fi
+
 if [[ $ACCESS_LOG ]]; then
   sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -47,5 +47,12 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
+
+        location /share/ {
+            proxy_pass http://share:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
     }
 }