Merge branch 'aims' into acs-aims

.env

@@ -1,5 +1,4 @@
-EXTERNAL_RESOURCE_DIR=/home/brian
+ALFRESCO_DIR=~/alfresco
-ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
 ALFRESCO_LICENSE_DIR=~/alfresco/license
 
 PROXY_PROTOCOL=http

docker-compose.yml

@@ -5,7 +5,7 @@ version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository:6.2.2.3
+        image: alfresco/alfresco-content-repository-community:6.2.0-ga
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
@@ -35,18 +35,7 @@ services:
                 -Dcsrf.filter.enabled=false
                 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
 
-                -Dtransform.service.enabled=true
+                -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=false
-
-                -Dtransform.service.url=http://transform-router:8095
-                -Dsfs.url=http://shared-file-store:8099
-                -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
-
-                -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
 
                 -Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
                 -Didentity-service.authentication.defaultAdministratorUserNames=admin.1
@@ -59,33 +48,6 @@ services:
         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:1.3.1
-        environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
-            CORE_AIO_URL : "http://transform-core-aio:8090"
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-        depends_on:
-            - activemq
-            - shared-file-store
-    
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
-        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: alfresco/alfresco-shared-file-store:0.10.0
-        volumes:
-            - shared-file-store-volume:/tmp/Alfresco/sfs
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
@@ -140,41 +102,6 @@ services:
         image: alfresco/alfresco-activemq:5.15.8
         mem_limit: 256m
 
-    sync:
-        image: quay.io/alfresco/service-sync:3.3.3.1
-        mem_limit: 512m
-        environment:
-            JAVA_OPTS : "
-                -Dsql.db.driver=org.postgresql.Driver
-                -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dsql.db.username=alfresco
-                -Dsql.db.password=alfresco
-                -Dmessaging.broker.host=activemq
-                -Drepo.hostname=platform
-                -Drepo.port=8080
-                -Ddw.server.applicationConnectors[0].type=http
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_BASEURL}/auth
-                -Didentity-service.resource=acs-sync
-                "
-        depends_on:
-            - postgres-acs
-            - activemq
-
-    digital-workspace:
-        image: quay.io/alfresco/alfresco-digital-workspace:2.0.0-adw
-        mem_limit: 128m
-        environment:
-            BASE_PATH: ./
-            APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
-            APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
-            APP_CONFIG_AUTH_TYPE: OAUTH
-            APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_BASEURL}/auth/realms/alfresco"
-            APP_CONFIG_OAUTH2_CLIENTID: alfresco
-            APP_CONFIG_OAUTH2_IMPLICIT_FLOW: "true"
-            APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/"
-            APP_CONFIG_OAUTH2_REDIRECT_LOGOUT: "/workspace/logout"
-
     identity:
         image: alfresco/alfresco-identity-service:1.3
         user: jboss
@@ -193,18 +120,10 @@ services:
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync-share-adw-aims
+        image: local/nginx-ingress:acs-share-aims
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - sync
             - share
-            - digital-workspace
             - identity
-
-volumes:
-    shared-file-store-volume:
-        driver_opts:
-            type: tmpfs
-            device: tmpfs

keycloak-alfresco-realm.json

@@ -42,24 +42,6 @@
       "attributes": {
         "login_theme": "alfresco"
       }
-    },
-    {
-      "clientId": "acs-sync",
-      "name": "Alfresco Sync Service Clients",
-      "enabled": true,
-      "alwaysDisplayInConsole": false,
-      "redirectUris": [
-        "http://127.0.0.1*",
-        "http://localhost*"
-      ],
-      "standardFlowEnabled": true,
-      "implicitFlowEnabled": false,
-      "directAccessGrantsEnabled": false,
-      "publicClient": true,
-      "protocol": "openid-connect",
-      "attributes": {
-        "login_theme": "alfresco"
-      }
     }
   ],
   "requiredCredentials": [ "password" ],

nginx-ingress/entrypoint.sh

@@ -4,18 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $ACS_SYNC_URL ]]; then
-  sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
-fi
-
 if [[ $ACS_SHARE_URL ]]; then
   sed -i s%http:\/\/share:8080%"$ACS_SHARE_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 [[ $AIMS_URL ]]; then
   sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -51,21 +51,10 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
-        
-        location /sync/ {
-            proxy_pass http://sync:9090/alfresco/;
-        }
 
         location /share/ {
             proxy_pass http://share:8080;
         }
-        
-        location /workspace/ {
-            proxy_pass http://digital-workspace:8080/;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
 
         location /auth/ {
             proxy_pass http://identity:8080;