Merge branch 'base' into ats-base

.env

@@ -1,6 +0,0 @@
-ALFRESCO_DIR=~/alfresco
-ALFRESCO_LICENSE_DIR=~/alfresco/license
-
-PROXY_PROTOCOL=http
-PROXY_HOST=localhost
-PROXY_PORT=8080

docker-compose.yml

@@ -4,45 +4,35 @@
 version: "2"
 
 services:
-    platform:
+    transform-router:
-        image: alfresco/alfresco-content-repository:latest
+        image: quay.io/alfresco/alfresco-transform-router:latest
         environment:
-            JAVA_OPTS: "
+            ACTIVEMQ_URL: "nio://activemq:61616"
-                -Ddb.driver=org.postgresql.Driver
+            CORE_AIO_URL : "http://transform-core-aio:8090"
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-                -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
-        volumes:
+            - shared-file-store
-            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
-    postgres-acs:
+    transform-core-aio:
-        image: postgres:latest
+        image: alfresco/alfresco-transform-core-aio:latest
-        volumes:
+        environment:
-            - acsdb-volume:/var/lib/postgresql/data:rw
+            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: alfresco/alfresco-shared-file-store:latest
+        volumes:
+            - shared-file-store-volume:/tmp/Alfresco/sfs
+    
     activemq:
         image: alfresco/alfresco-activemq:latest
-        volumes:
-            - activemq-volume:/opt/activemq/data:rw
-
-    proxy:
-        build: ./nginx-ingress
-        image: local/nginx-ingress:acs
-        ports:
-            - 8080:8080
-        depends_on:
-            - platform
 
 volumes:
-    acsbin-volume:
+    shared-file-store-volume:
-        driver: local
+        driver_opts:
-    acsdb-volume:
+            type: tmpfs
-        driver: local
+            device: tmpfs
-    activemq-volume:
-        driver: local

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,11 +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 [[ $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,52 +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;
-        }
-    }
-}