Merge branch 'proxy' into aps-base

.env

@@ -4,8 +4,3 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
-
-ACS_TAG=7.4.1.1
-AAMQ_TAG=latest
-POSTGRES_TAG=13
-ACS_SHARE_TAG=7.4.1.2

alfresco-share/docker/Dockerfile

@@ -1,11 +0,0 @@
-ARG ACS_SHARE_TAG=inject-it
-FROM alfresco/alfresco-share:${ACS_SHARE_TAG}
-
-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/share
-

alfresco-share/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 Share web application.

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

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

alfresco-share/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 Share web application.

docker-compose.yml

@@ -1,68 +1,54 @@
-# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-version: "3"
+# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "2"
 
 services:
-
+    activiti-app:
-    platform:
+        image: alfresco/process-services:latest
-        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
         environment:
-            JAVA_TOOL_OPTIONS: "
+            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-                -Dencryption.keystore.type=JCEKS
+            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
-                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-                -Dencryption.keyAlgorithm=DESede
-                -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-                -Dmetadata-keystore.password=mp6yc0UD9e
-                -Dmetadata-keystore.aliases=metadata
-                -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-                -Dmetadata-keystore.metadata.algorithm=DESede"
-            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}
-                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                "
         depends_on:
-            - postgres-acs
+            - postgres-aps
-            - activemq
-    
-    share:
-        build:
-            context: ./alfresco-share/docker
-            args:
-                ACS_SHARE_TAG: ${ACS_SHARE_TAG}
-        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/share:ro"
+            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
-    postgres-acs:
+    activiti-admin:
-        image: postgres:${POSTGRES_TAG}
+        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
     
-    activemq:
+    postgres-aps:
-        image: alfresco/alfresco-activemq:${AAMQ_TAG}
+        image: postgres:latest
+        environment:
+            POSTGRES_DB: activiti
+    
+    postgres-aps-admin:
+        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
-        image: local/nginx-ingress:acs-share
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
-            - platform
+            - activiti-app
-            - share
+            - activiti-admin

nginx-ingress/entrypoint.sh

@@ -1,11 +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 [[ $ACS_SHARE_URL ]]; then
+if [[ $APS_ADMIN_URL ]]; then
-  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
+  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,18 +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 /share/ {
+        location /activiti-admin/ {
-            proxy_pass http://share:8080;
+            proxy_pass http://activiti-admin:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;