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

alfresco-share/docker/Dockerfile

@@ -0,0 +1,10 @@
+FROM alfresco/alfresco-share:latest
+
+ARG TOMCAT_DIR=/usr/local/tomcat
+
+COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml
+COPY *.amp ${TOMCAT_DIR}/amps_share/
+
+RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory && \
+	mkdir -p ${TOMCAT_DIR}/modules
+

alfresco-share/docker/README.md

@@ -0,0 +1,3 @@
+## Usage
+
+Download all AMP files needed into this directory.  All of them will be copied into a new Docker image and installed into the Alfresco Share web application.

alfresco-share/docker/tomcat-share-context.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Context>
+        <Resources>
+                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
+        </Resources>
+</Context>
+

alfresco-share/modules/README.md

@@ -0,0 +1,3 @@
+## Usage
+
+Download all JAR module files needed into this directory.  All of them will be dynamically loaded into the Docker container and loaded into the Alfresco Share web application.

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}
@@ -19,6 +22,24 @@ services:
             - postgres-acs
             - activemq
     
+    share:
+        build: ./alfresco-share/docker
+        image: local/alfresco-share:latest
+        environment:
+            REPO_HOST: "platform"
+            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
+            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
+            JAVA_OPTS: "
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
+                "
+        volumes:
+            - "./alfresco-share/modules:/usr/local/tomcat/modules:ro"
+    
     postgres-acs:
         image: postgres:latest
 
@@ -27,8 +48,9 @@ services:
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:acs-share
         ports:
             - 8080:8080
         depends_on:
             - platform
+            - share

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;
+        }
     }
 }