updated ATS versions

.env

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

docker-compose.yml

@@ -4,46 +4,35 @@ version: "3"
 
 services:
 
-    platform:
+    transform-router:
-        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
+        image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
         environment:
-            JAVA_TOOL_OPTIONS: "
+            ACTIVEMQ_URL: "nio://activemq:61616"
-                -Dencryption.keystore.type=JCEKS
+            CORE_AIO_URL : "http://transform-core-aio:8090"
-                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-                -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
-                -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
             - activemq
+            - shared-file-store
     
-    postgres-acs:
+    transform-core-aio:
-        image: postgres:${POSTGRES_TAG}
+        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"
+        depends_on:
+            - activemq
+            - shared-file-store
+
+    shared-file-store:
+        image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
+        volumes:
+            - shared-file-store-volume:/tmp/Alfresco/sfs
     
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
-    digital-workspace:
+volumes:
-        image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
+    shared-file-store-volume:
-        environment:
+        driver_opts:
-            APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
+            type: tmpfs
-    
+            device: tmpfs
-    proxy:
-        build: ./nginx-ingress
-        image: local/nginx-ingress:acs-adw
-        ports:
-            - 8080:8080
-        depends_on:
-            - platform
-            - digital-workspace

nginx-ingress/Dockerfile

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

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [[ $ACS_PLATFORM_URL ]]; then
-  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
-fi
-
-if [[ $ADW_URL ]]; then
-  sed -i s%http:\/\/digital-workspace:8080%"$ADW_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

@@ -1,59 +0,0 @@
-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;
-        }
-
-        location /workspace/ {
-            proxy_pass http://digital-workspace:8080/;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
-    }
-}