Merge branch 'proxy' into aps-base

alfresco-content-repository/docker/Dockerfile

@@ -1,16 +0,0 @@
-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

@@ -1,3 +0,0 @@
-## 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

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

alfresco-content-repository/docker/tomcat-platform-context.xml

@@ -1,7 +0,0 @@
-<?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

@@ -1,3 +0,0 @@
-## 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

@@ -4,29 +4,45 @@
 version: "2"
 
 services:
-    platform:
+    activiti-app:
-        build: ./alfresco-content-repository/docker
+        image: alfresco/process-services:latest
-        image: local/alfresco-content-repository:latest
         environment:
-            JAVA_OPTS: "
+            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-                -Ddb.driver=org.postgresql.Driver
+            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dalfresco.host=${PROXY_HOST}
-                -Dalfresco.port=${PROXY_PORT}
-                -Dalfresco.protocol=${PROXY_PROTOCOL}
-                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                "
         depends_on:
-            - postgres-acs
+            - postgres-aps
-            - activemq
         volumes:
-            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
+            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
-    postgres-acs:
+    activiti-admin:
+        image: alfresco/process-services-admin:latest
+        environment:
+            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
+            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
+        depends_on:
+            - postgres-aps-admin
+            - activiti-app
+    
+    postgres-aps:
         image: postgres:latest
+        environment:
+            POSTGRES_DB: activiti
     
-    activemq:
+    postgres-aps-admin:
-        image: alfresco/alfresco-activemq:latest
+        image: postgres:latest
+        environment:
+            POSTGRES_DB: activiti-admin
+    
+    search-aps:
+        image: elasticsearch:latest
+        environment:
+            discovery.type: single-node
+        ulimits:
+            memlock:
+                soft: -1
+                hard: -1
+        depends_on:
+            - activiti-app
 
     proxy:
         build: ./nginx-ingress
@@ -34,4 +50,5 @@ services:
         ports:
             - 8080:8080
         depends_on:
-            - platform
+            - activiti-app
+            - activiti-admin

nginx-ingress/entrypoint.sh

@@ -1,7 +1,11 @@
 #!/bin/sh
 
-if [[ $ACS_PLATFORM_URL ]]; then
+if [[ $APS_APP_URL ]]; then
-  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
+fi
+
+if [[ $APS_ADMIN_URL ]]; then
+  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

@@ -39,11 +39,18 @@ http {
         location ~ ^(/.*/s/prometheus)$ {return 403;}
         
         location / {
-            proxy_pass http://platform:8080;
+            return 301 $scheme://$http_host/activiti-app;
         }
 
-        location /alfresco/ {
+        location /activiti-app/ {
-            proxy_pass http://platform:8080;
+            proxy_pass http://activiti-app:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+
+        location /activiti-admin/ {
+            proxy_pass http://activiti-admin:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;