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

docker-compose.yml

@@ -5,10 +5,19 @@ version: "2"
 
 services:
     activiti-app:
-        image: alfresco/process-services:latest
+        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:
@@ -16,32 +25,49 @@ services:
             - apsbin-volume:/var/lib/postgresql/data:rw
     
     activiti-admin:
-        image: alfresco/process-services-admin:latest
+        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:latest
+        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
         volumes:
             - apsdb-volume:/var/lib/postgresql/data:rw
     
     postgres-aps-admin:
-        image: postgres:latest
+        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
         volumes:
             - apsadmindb-volume:/var/lib/postgresql/data:rw
     
     search-aps:
-        image: elasticsearch:latest
+        image: elasticsearch:7.6.0
+        mem_limit: 512m
         environment:
             discovery.type: single-node
+            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
         ulimits:
             memlock:
                 soft: -1