Merge branch 'dbp-aims' into dbp-persist-aims

This commit is contained in:
Brian Long 2021-07-30 16:51:38 -04:00
commit 6c62fb96e7

View File

@ -6,7 +6,7 @@ version: "2.1"
services: services:
platform: platform:
image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
mem_limit: 1700m mem_limit: 2g
environment: environment:
JAVA_OPTS: " JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver -Ddb.driver=org.postgresql.Driver
@ -71,6 +71,7 @@ services:
transform-router: transform-router:
image: quay.io/alfresco/alfresco-transform-router:1.3.1 image: quay.io/alfresco/alfresco-transform-router:1.3.1
mem_limit: 128m
environment: environment:
ACTIVEMQ_URL: "nio://activemq:61616" ACTIVEMQ_URL: "nio://activemq:61616"
CORE_AIO_URL : "http://transform-core-aio:8090" CORE_AIO_URL : "http://transform-core-aio:8090"
@ -81,6 +82,7 @@ services:
transform-core-aio: transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.3.6 image: alfresco/alfresco-transform-core-aio:2.3.6
mem_limit: 1g
environment: environment:
ACTIVEMQ_URL: "nio://activemq:61616" ACTIVEMQ_URL: "nio://activemq:61616"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@ -90,6 +92,7 @@ services:
shared-file-store: shared-file-store:
image: alfresco/alfresco-shared-file-store:0.10.0 image: alfresco/alfresco-shared-file-store:0.10.0
mem_limit: 256m
volumes: volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs - shared-file-store-volume:/tmp/Alfresco/sfs
@ -121,7 +124,7 @@ services:
postgres-acs: postgres-acs:
image: postgres:11.7 image: postgres:11.7
mem_limit: 512m mem_limit: 128m
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco - POSTGRES_USER=alfresco
@ -132,7 +135,7 @@ services:
search: search:
image: alfresco/alfresco-search-services:2.0.1 image: alfresco/alfresco-search-services:2.0.1
mem_limit: 2g mem_limit: 1g
environment: environment:
- SOLR_ALFRESCO_HOST=platform - SOLR_ALFRESCO_HOST=platform
- SOLR_ALFRESCO_PORT=8080 - SOLR_ALFRESCO_PORT=8080
@ -145,7 +148,7 @@ services:
activemq: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:5.15.8
mem_limit: 256m mem_limit: 512m
volumes: volumes:
- activemq-volume:/opt/activemq/data:rw - activemq-volume:/opt/activemq/data:rw
@ -229,7 +232,7 @@ services:
postgres-aps: postgres-aps:
image: postgres:11.6 image: postgres:11.6
mem_limit: 256m mem_limit: 128m
environment: environment:
POSTGRES_DB: activiti POSTGRES_DB: activiti
POSTGRES_USER: alfresco POSTGRES_USER: alfresco
@ -265,7 +268,8 @@ services:
- esindex-volume:/var/lib/postgresql/data:rw - esindex-volume:/var/lib/postgresql/data:rw
identity: identity:
image: alfresco/alfresco-identity-service:1.3 image: alfresco/alfresco-identity-service:1.4.0
mem_limit: 512m
user: jboss user: jboss
environment: environment:
KEYCLOAK_USER: admin KEYCLOAK_USER: admin
@ -278,7 +282,7 @@ services:
aliases: aliases:
- "${IDENTITY_SERVICE_HOST}" - "${IDENTITY_SERVICE_HOST}"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/auth"] test: ["CMD", "curl", "-f", "http://localhost:8080/auth/realms/alfresco"]
interval: 10s interval: 10s
timeout: 10s timeout: 10s
# Really long startup times on Windows # Really long startup times on Windows
@ -290,6 +294,7 @@ services:
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:acs-sync-share-adw-aps-aims image: local/nginx-ingress:acs-sync-share-adw-aps-aims
mem_limit: 256m
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on: