Merge branch 'acs-base' into acs-share-base

docker-compose.yml

@@ -10,6 +10,9 @@ services:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -18,31 +21,21 @@ services:
         depends_on:
             - postgres-acs
             - activemq
-            - shared-file-store
     
-    transform-router:
+    share:
-        image: quay.io/alfresco/alfresco-transform-router:latest
+        image: alfresco/alfresco-share:latest
         environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
+            REPO_HOST: "platform"
-            CORE_AIO_URL : "http://transform-core-aio:8090"
+            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
+            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
-        depends_on:
+            JAVA_OPTS: "
-            - activemq
+                -Dshare.host=${PROXY_HOST}
-            - shared-file-store
+                -Dshare.port=${PROXY_PORT}
-    
+                -Dshare.protocol=${PROXY_PROTOCOL}
-    transform-core-aio:
+                -Dalfresco.host=${PROXY_HOST}
-        image: alfresco/alfresco-transform-core-aio:latest
+                -Dalfresco.port=${PROXY_PORT}
-        environment:
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
-            ACTIVEMQ_URL: "nio://activemq:61616"
+                "
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-        depends_on:
-            - activemq
-            - shared-file-store
-
-    shared-file-store:
-        image: alfresco/alfresco-shared-file-store:latest
-        volumes:
-            - shared-file-store-volume:/tmp/Alfresco/sfs
     
     postgres-acs:
         image: postgres:latest
@@ -52,14 +45,9 @@ services:
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:acs-share
         ports:
             - 8080:8080
         depends_on:
             - platform
-
+            - share
-volumes:
-    shared-file-store-volume:
-        driver_opts:
-            type: tmpfs
-            device: tmpfs

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

@@ -48,5 +48,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;
+        }
     }
 }