diff --git a/docker-compose.yml b/docker-compose.yml index e750f46..13583b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,10 @@ services: -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco - -Dindex.subsystem.name=noindex + -Dindex.subsystem.name=solr6 + -Dsolr.host=search + -Dsolr.port=8983 + -Dsolr.secureComms=none -Dalfresco.host=${PROXY_HOST} -Dalfresco.port=${PROXY_PORT} -Dalfresco.protocol=${PROXY_PROTOCOL} @@ -23,8 +26,16 @@ services: -Dcsrf.filter.enabled=false -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - -Dtransform.service.enabled=false + -Dtransform.service.enabled=true -Dlocal.transform.service.enabled=false + + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099 + -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090 + -Djodconverter.url=http://transform-engine-aio:8090 + -Dimg.url=http://transform-engine-aio:8090 + -Dtika.url=http://transform-engine-aio:8090 + -Dtransform.misc.url=http://transform-engine-aio:8090 -Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.orphanProtectDays=0 @@ -33,9 +44,34 @@ services: depends_on: - postgres-acs - activemq + - shared-file-store volumes: - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro" + transform-router: + image: quay.io/alfresco/alfresco-transform-router:1.3.1 + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL : "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + depends_on: + - activemq + - shared-file-store + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.3.6 + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + depends_on: + - activemq + - shared-file-store + + shared-file-store: + image: alfresco/alfresco-shared-file-store:0.10.0 + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + postgres-acs: image: postgres:11.7 mem_limit: 512m @@ -44,6 +80,17 @@ services: - POSTGRES_USER=alfresco - POSTGRES_DB=alfresco command: postgres -c max_connections=300 -c log_min_messages=LOG + + search: + image: alfresco/alfresco-search-services:2.0.1 + mem_limit: 2g + environment: + - SOLR_ALFRESCO_HOST=platform + - SOLR_ALFRESCO_PORT=8080 + - SOLR_SOLR_HOST=search + - SOLR_SOLR_PORT=8983 + - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive + - ALFRESCO_SECURE_COMMS=none activemq: image: alfresco/alfresco-activemq:5.15.8 @@ -56,3 +103,9 @@ services: - 8080:8080 depends_on: - platform + +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs