fixed dup service

docker-compose.yml

@@ -5,7 +5,7 @@ version: "2"
 
 services:
     platform:
-        image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
+        image: alfresco/alfresco-content-repository:6.2.2.3
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
@@ -83,11 +83,8 @@ services:
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
-    
     share:
-        image: quay.io/alfresco/alfresco-governance-share-enterprise:V3.4-latest
+        image: alfresco/alfresco-share:6.2.2
         mem_limit: 512m
         environment:
             REPO_HOST: "platform"
@@ -152,76 +149,10 @@ services:
             BASE_PATH: ./
             APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
             APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
-
-    activiti-app:
-        image: alfresco/process-services:1.11.1.1
-        mem_limit: 512m
-        environment:
-            ACTIVITI_DATASOURCE_USERNAME: alfresco
-            ACTIVITI_DATASOURCE_PASSWORD: alfresco
-            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
-            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-            ACTIVITI_ES_SERVER_TYPE: rest
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
-            ACTIVITI_ES_REST_CLIENT_PORT: 9200
-            ACTIVITI_ES_REST_CLIENT_SCHEMA: http
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
-        depends_on:
-            - postgres-aps
-        volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
-    
-    activiti-admin:
-        image: alfresco/process-services-admin:1.11.1.1
-        mem_limit: 256m
-        environment:
-            ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
-            ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
-            ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
-            ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
-            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
-            ACTIVITI_ADMIN_REST_APP_PORT: 8080
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
-        depends_on:
-            - postgres-aps-admin
-            - activiti-app
-    
-    postgres-aps:
-        image: postgres:11.6
-        mem_limit: 256m
-        environment:
-            POSTGRES_DB: activiti
-            POSTGRES_USER: alfresco
-            POSTGRES_PASSWORD: alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    
-    postgres-aps-admin:
-        image: postgres:11.6
-        mem_limit: 128m
-        environment:
-            POSTGRES_DB: activiti-admin
-            POSTGRES_USER: alfresco
-            POSTGRES_PASSWORD: alfresco
-        command: postgres -c max_connections=50 -c log_min_messages=LOG
-    
-    search-aps:
-        image: elasticsearch:7.6.0
-        mem_limit: 512m
-        environment:
-            discovery.type: single-node
-            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
-        depends_on:
-            - activiti-app
     
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync-share-adw-aps
+        image: local/nginx-ingress:acs-sync-share-adw
         ports:
             - 8080:8080
         depends_on:
@@ -229,8 +160,6 @@ services:
             - sync
             - share
             - digital-workspace
-            - activiti-app
-            - activiti-admin
 
 volumes:
     shared-file-store-volume:

nginx-ingress/entrypoint.sh

@@ -16,14 +16,6 @@ if [[ $ADW_URL ]]; then
   sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $APS_APP_URL ]]; then
-  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
-fi
-
-if [[ $APS_ADMIN_URL ]]; then
-  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_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

@@ -53,20 +53,6 @@ http {
             proxy_pass http://sync:9090/alfresco/;
         }
 
-        location /activiti-app/ {
-            proxy_pass http://activiti-app:8080;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
-
-        location /activiti-admin/ {
-            proxy_pass http://activiti-admin:8080;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
-
         location /share/ {
             proxy_pass http://share:8080;