Merge branch 'ags-enterprise' into ags-backend-enterprise

.env

@@ -12,6 +12,4 @@ ASFS_TAG=3.0.0
 AAMQ_TAG=latest
 POSTGRES_TAG=13
 ASIE_TAG=2.0.8.2
-ACS_SHARE_TAG=7.4.1.2
 ALF_SYNC_SERV_TAG=3.9.0
-ADW_TAG=4.1.0

docker-compose.yml

@@ -5,7 +5,7 @@ version: "3"
 services:
 
     platform:
-        image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG}
+        image: quay.io/alfresco/alfresco-governance-repository-enterprise:${ACS_TAG}
         environment:
             JAVA_TOOL_OPTIONS: "
                 -Dencryption.keystore.type=JCEKS
@@ -27,9 +27,6 @@ services:
                 -Dsolr.host=search
                 -Dsolr.secureComms=secret
                 -Dsolr.sharedSecret=alfresco-secret
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -83,21 +80,6 @@ services:
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
-    share:
-        image: alfresco/alfresco-share:${ACS_SHARE_TAG}
-        environment:
-            REPO_HOST: "platform"
-            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
-            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
-            JAVA_OPTS: "
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
-                -Dalfresco.host=${PROXY_HOST}
-                -Dalfresco.port=${PROXY_PORT}
-                -Dalfresco.protocol=${PROXY_PROTOCOL}
-                "
-    
     postgres-acs:
         image: postgres:${POSTGRES_TAG}
         environment:
@@ -144,23 +126,14 @@ services:
             - postgres-acs
             - activemq
 
-    digital-workspace:
-        image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
-        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"
-    
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync-share-adw
+        image: local/nginx-ingress:acs-sync
         ports:
             - 8080:8080
         depends_on:
             - platform
             - sync
-            - share
-            - digital-workspace
 
 volumes:
     shared-file-store-volume:

nginx-ingress/entrypoint.sh

@@ -8,14 +8,6 @@ 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 [[ $ACCESS_LOG ]]; then
   sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -52,19 +52,5 @@ http {
         location /sync/ {
             proxy_pass http://sync:9090/alfresco/;
         }
-
-        location /share/ {
-            proxy_pass http://share: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;
-        }
     }
 }