Merge branch 'aps-base' into aps-persist-base

docker-compose.yml

@@ -5,70 +5,51 @@ version: "2"
 
 services:
     activiti-app:
-        image: alfresco/process-services:1.11.1.1
+        image: alfresco/process-services:latest
-        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"
+            - apsbin-volume:/var/lib/postgresql/data:rw
     
     activiti-admin:
-        image: alfresco/process-services-admin:1.11.1.1
+        image: alfresco/process-services-admin:latest
-        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
+        image: postgres:latest
-        mem_limit: 256m
         environment:
             POSTGRES_DB: activiti
-            POSTGRES_USER: alfresco
+        volumes:
-            POSTGRES_PASSWORD: alfresco
+            - apsdb-volume:/var/lib/postgresql/data:rw
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     postgres-aps-admin:
-        image: postgres:11.6
+        image: postgres:latest
-        mem_limit: 128m
         environment:
             POSTGRES_DB: activiti-admin
-            POSTGRES_USER: alfresco
+        volumes:
-            POSTGRES_PASSWORD: alfresco
+            - apsadmindb-volume:/var/lib/postgresql/data:rw
-        command: postgres -c max_connections=50 -c log_min_messages=LOG
     
     search-aps:
-        image: elasticsearch:7.6.0
+        image: elasticsearch:latest
-        mem_limit: 512m
         environment:
             discovery.type: single-node
-            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
         ulimits:
             memlock:
                 soft: -1
                 hard: -1
         depends_on:
             - activiti-app
+        volumes:
+            - esindex-volume:/var/lib/postgresql/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -78,3 +59,13 @@ services:
         depends_on:
             - activiti-app
             - activiti-admin
+
+volumes:
+    apsbin-volume:
+        driver: local
+    apsdb-volume:
+        driver: local
+    apsadmindb-volume:
+        driver: local
+    esindex-volume:
+        driver: local