Merge branch 'acs-enterprise' into acs-ats-enterprise

.env

@@ -0,0 +1,13 @@
+ALFRESCO_DIR=~/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license
+
+PROXY_PROTOCOL=http
+PROXY_HOST=localhost
+PROXY_PORT=8080
+
+ACS_TAG=7.4.1.1
+ATR_TAG=3.0.0
+ATE_AIO_TAG=4.0.0
+ASFS_TAG=3.0.0
+AAMQ_TAG=latest
+POSTGRES_TAG=13

README.md

@@ -3,3 +3,11 @@
 
 This Git Repository intends to represent environments in Docker Compose.  All environments are effectively a derivative of other environments.  The original environment is the environment represented by the `base` branch.  All derivative environments are represented by other branches.  Those branches are named in the format `{core}.{parent}`.
 
+## Licensing
+
+This version of Alfresco requires licensing.
+
+### ACS Enterprise
+
+The enterprise version of ACS requires a license file for it to work for more than 2 days.  This means it isn't really required, but it is becomes important when you utilize any `persist` branch.  For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/acs`.  There must be just one file in there that ends in `.lic`.
+

docker-compose.yml

@@ -1,11 +1,59 @@
-# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
-version: "2"
+version: "3"
 
 services:
+
+    platform:
+        image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG}
+        environment:
+            JAVA_TOOL_OPTIONS: "
+                -Dencryption.keystore.type=JCEKS
+                -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: "
+                -Xms512m -Xmx1g
+                -Ddb.driver=org.postgresql.Driver
+                -Ddb.username=alfresco
+                -Ddb.password=alfresco
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dindex.subsystem.name=noindex
+                -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
+                -Dcors.enabled=false
+                -Dtransform.service.enabled=false
+                -Dtransform.service.url=http://transform-router:8095
+                -Dsfs.url=http://shared-file-store:8099
+                -Dlocal.transform.service.enabled=false
+                -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
+                -Djodconverter.url=http://transform-engine-aio:8090
+                -Dimg.url=http://transform-engine-aio:8090
+                -Dtika.url=http://transform-engine-aio:8090
+                -Dtransform.misc.url=http://transform-engine-aio:8090
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
+                "
+        depends_on:
+            - postgres-acs
+            - activemq
+            - shared-file-store
+        volumes:
+            - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
+    
     transform-router:
-        image: quay.io/alfresco/alfresco-transform-router:latest
+        image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -15,7 +63,7 @@ services:
             - shared-file-store
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:latest
+        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -24,12 +72,32 @@ services:
             - shared-file-store
 
     shared-file-store:
-        image: alfresco/alfresco-shared-file-store:latest
+        image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
+    postgres-acs:
+        image: postgres:${POSTGRES_TAG}
+        environment:
+            POSTGRES_PASSWORD: alfresco
+            POSTGRES_USER: alfresco
+            POSTGRES_DB: alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
+
     activemq:
-        image: alfresco/alfresco-activemq:latest
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
+        environment:
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
+
+    proxy:
+        build: ./nginx-ingress
+        image: local/nginx-ingress:acs
+        ports:
+            - 8080:8080
+        depends_on:
+            - platform
 
 volumes:
     shared-file-store-volume:

nginx-ingress/Dockerfile

@@ -0,0 +1,8 @@
+FROM nginx:stable-alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT [ "/entrypoint.sh" ]

nginx-ingress/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [[ $ACS_PLATFORM_URL ]]; then
+  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_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 -g "daemon off;"

nginx-ingress/nginx.conf

@@ -0,0 +1,52 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    server {
+        listen *:8080;
+
+        client_max_body_size 0;
+
+        set  $allowOriginSite *;
+        proxy_pass_request_headers on;
+        proxy_pass_header Set-Cookie;
+
+        # External settings, do not remove
+        #ENV_ACCESS_LOG
+
+        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+        proxy_redirect off;
+        proxy_buffering off;
+        proxy_set_header Host              $http_host;
+        proxy_set_header X-Real-IP         $remote_addr;
+        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass_header Set-Cookie;
+        
+        # Protect access to SOLR APIs
+        location ~ ^(/.*/service/api/solr/.*)$ {return 403;}
+        location ~ ^(/.*/s/api/solr/.*)$ {return 403;}
+        location ~ ^(/.*/wcservice/api/solr/.*)$ {return 403;}
+        location ~ ^(/.*/wcs/api/solr/.*)$ {return 403;}
+
+        location ~ ^(/.*/proxy/alfresco/api/solr/.*)$ {return 403 ;}
+        location ~ ^(/.*/-default-/proxy/alfresco/api/.*)$ {return 403;}
+        
+        # Protect access to Prometheus endpoint
+        location ~ ^(/.*/s/prometheus)$ {return 403;}
+        
+        location / {
+            proxy_pass http://platform:8080;
+        }
+
+        location /alfresco/ {
+            proxy_pass http://platform:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+    }
+}