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

alfresco-content-repository/docker/Dockerfile

@@ -0,0 +1,16 @@
+FROM alfresco/alfresco-content-repository:latest
+
+ARG USERNAME=alfresco
+ARG TOMCAT_DIR=/usr/local/tomcat
+
+USER root
+
+COPY catalina.policy /tmp/catalina.policy.ext
+COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.xml
+COPY *.amp ${TOMCAT_DIR}/amps/
+
+RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory && \
+	mkdir -p ${TOMCAT_DIR}/modules && \
+	cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
+
+USER ${USERNAME}

alfresco-content-repository/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 Platform web application.

alfresco-content-repository/docker/catalina.policy

@@ -0,0 +1,4 @@
+grant codeBase "file:${catalina.base}/modules/-" {
+    permission java.security.AllPermission;
+};
+

alfresco-content-repository/docker/tomcat-platform-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-content-repository/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 Platform web application.

docker-compose.yml

@@ -5,75 +5,33 @@ version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository-community:6.2.0-ga
-        mem_limit: 1700m
+        build: ./alfresco-content-repository/docker
+        image: local/alfresco-content-repository:latest
         environment:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dindex.subsystem.name=solr6
-                -Dsolr.host=search
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
-                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                -Ddeployment.method=DOCKER_COMPOSE
-                -Dcsrf.filter.enabled=false
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-
-                -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=false
-                
-                -Dsystem.content.eagerOrphanCleanup=true
-                -Dsystem.content.orphanProtectDays=0
-                -Djodconverter.enabled=false
                 "
         depends_on:
             - postgres-acs
             - activemq
+        volumes:
+            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
     
     postgres-acs:
-        image: postgres:11.7
-        mem_limit: 128m
-        environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    
-    search:
-        image: quay.io/alfresco/insight-engine:2.0.1
-        mem_limit: 1g
-        environment:
-            - SOLR_ALFRESCO_HOST=platform
-            - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=search
-            - SOLR_SOLR_PORT=8983
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-            - ALFRESCO_SECURE_COMMS=none
-    
-    insight:
-        image: quay.io/alfresco/insight-zeppelin:2.0.1
-        mem_limit: 1g
-        environment:
-            - REPO_HOST=platform
-            - REPO_PORT=8080
+        image: postgres:latest
 
     activemq:
-        image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 512m
+        image: alfresco/alfresco-activemq:latest
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-insight
-        mem_limit: 256m
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - insight

nginx-ingress/entrypoint.sh

@@ -4,10 +4,6 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $INSIGHT_URL ]]; then
-  sed -i s%http:\/\/insight:9090%"$INSIGHT_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,12 +48,5 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
-
-        location /zeppelin/ {
-            proxy_pass http://insight:9090;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
     }
 }