Merge branch 'acs-backend' into acs-frontend

docker-compose.yml

@@ -4,77 +4,95 @@
 version: "2"
 
 services:
-    activiti-app:
+    platform:
-        image: alfresco/process-services:1.11.1.1
+        image: alfresco/alfresco-content-repository-community:6.2.0-ga
+        mem_limit: 1700m
+        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
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
+                -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
+                -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
+                -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
+                -Djodconverter.url=http://transform-core-aio:8090/
+                -Dimg.url=http://transform-core-aio:8090/
+                -Dtika.url=http://transform-core-aio:8090/
+                -Dtransform.misc.url=http://transform-core-aio:8090/
+                -Dcsrf.filter.enabled=false
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+
+                -Dtransform.service.enabled=false
+                
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
+                "
+        depends_on:
+            - postgres-acs
+            - activemq
+    
+    transform-core-aio:
+        image: alfresco/alfresco-transform-core-aio:2.3.6
+    
+    share:
+        image: alfresco/alfresco-share:6.2.2
         mem_limit: 512m
         environment:
-            ACTIVITI_DATASOURCE_USERNAME: alfresco
+            REPO_HOST: "platform"
-            ACTIVITI_DATASOURCE_PASSWORD: alfresco
+            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
-            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
+            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
-            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+            JAVA_OPTS: "
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+                -Dshare.host=${PROXY_HOST}
-            ACTIVITI_ES_SERVER_TYPE: rest
+                -Dshare.port=${PROXY_PORT}
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
+                -Dshare.protocol=${PROXY_PROTOCOL}
-            ACTIVITI_ES_REST_CLIENT_PORT: 9200
+                -Dalfresco.host=${PROXY_HOST}
-            ACTIVITI_ES_REST_CLIENT_SCHEMA: http
+                -Dalfresco.port=${PROXY_PORT}
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
-        depends_on:
+                "
-            - postgres-aps
-        volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
-    activiti-admin:
+    postgres-acs:
-        image: alfresco/process-services-admin:1.11.1.1
+        image: postgres:11.7
-        mem_limit: 256m
+        mem_limit: 512m
         environment:
-            ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
+            - POSTGRES_PASSWORD=alfresco
-            ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
+            - POSTGRES_USER=alfresco
-            ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
+            - POSTGRES_DB=alfresco
-            ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
-            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
-            ACTIVITI_ADMIN_REST_APP_PORT: 8080
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
-        depends_on:
-            - postgres-aps-admin
-            - activiti-app
-    
-    postgres-aps:
-        image: postgres:11.6
-        mem_limit: 256m
-        environment:
-            POSTGRES_DB: activiti
-            POSTGRES_USER: alfresco
-            POSTGRES_PASSWORD: alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
-    postgres-aps-admin:
+    search:
-        image: postgres:11.6
+        image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 128m
+        mem_limit: 2g
         environment:
-            POSTGRES_DB: activiti-admin
+            - SOLR_ALFRESCO_HOST=platform
-            POSTGRES_USER: alfresco
+            - SOLR_ALFRESCO_PORT=8080
-            POSTGRES_PASSWORD: alfresco
+            - SOLR_SOLR_HOST=search
-        command: postgres -c max_connections=50 -c log_min_messages=LOG
+            - SOLR_SOLR_PORT=8983
-    
+            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-    search-aps:
+            - ALFRESCO_SECURE_COMMS=none
-        image: elasticsearch:7.6.0
+
-        mem_limit: 512m
+    activemq:
-        environment:
+        image: alfresco/alfresco-activemq:5.15.8
-            discovery.type: single-node
+        mem_limit: 256m
-            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
-        depends_on:
-            - activiti-app
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:acs-share
         ports:
             - 8080:8080
         depends_on:
-            - activiti-app
+            - platform
-            - activiti-admin
+            - share

nginx-ingress/entrypoint.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-if [[ $APS_APP_URL ]]; then
+if [[ $ACS_PLATFORM_URL ]]; then
-  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $APS_ADMIN_URL ]]; then
+if [[ $ACS_SHARE_URL ]]; then
-  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/share:8080%"$ACS_SHARE_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 / {
-            return 301 $scheme://$http_host/activiti-app;
+            proxy_pass http://platform:8080;
         }
 
-        location /activiti-app/ {
+        location /alfresco/ {
-            proxy_pass http://activiti-app:8080;
+            proxy_pass http://platform:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
 
-        location /activiti-admin/ {
+        location /share/ {
-            proxy_pass http://activiti-admin:8080;
+            proxy_pass http://share:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;