Merge branch 'acs-search' into acs-search-persist
This commit is contained in:
commit
2eab63c2a8
6
.env
6
.env
@ -5,7 +5,7 @@ PROXY_PROTOCOL=http
|
|||||||
PROXY_HOST=localhost
|
PROXY_HOST=localhost
|
||||||
PROXY_PORT=8080
|
PROXY_PORT=8080
|
||||||
|
|
||||||
ACS_TAG=7.3.0
|
ACS_TAG=7.4.1.1
|
||||||
AAMQ_TAG=5.17.1-jre17-centos7
|
AAMQ_TAG=latest
|
||||||
POSTGRES_TAG=13
|
POSTGRES_TAG=13
|
||||||
ASIE_TAG=2.0.5
|
ASIE_TAG=2.0.8.2
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
|
# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
|
||||||
#
|
#
|
||||||
version: "3"
|
version: "3"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
platform:
|
platform:
|
||||||
image: alfresco/alfresco-content-repository-community:${ACS_TAG}
|
image: alfresco/alfresco-content-repository-community:${ACS_TAG}
|
||||||
environment:
|
environment:
|
||||||
@ -14,16 +15,31 @@ services:
|
|||||||
-Dmetadata-keystore.password=mp6yc0UD9e
|
-Dmetadata-keystore.password=mp6yc0UD9e
|
||||||
-Dmetadata-keystore.aliases=metadata
|
-Dmetadata-keystore.aliases=metadata
|
||||||
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
|
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
|
||||||
-Dmetadata-keystore.metadata.algorithm=DESede"
|
-Dmetadata-keystore.metadata.algorithm=DESede
|
||||||
|
"
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
|
-Xms512m -Xmx1g
|
||||||
-Ddb.driver=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
|
-Ddb.username=alfresco
|
||||||
|
-Ddb.password=alfresco
|
||||||
|
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
||||||
|
-Dindex.subsystem.name=solr6
|
||||||
-Dsolr.host=search
|
-Dsolr.host=search
|
||||||
-Dsolr.secureComms=secret
|
-Dsolr.secureComms=secret
|
||||||
-Dsolr.sharedSecret=alfresco-secret
|
-Dsolr.sharedSecret=alfresco-secret
|
||||||
-Dalfresco.host=${PROXY_HOST}
|
-Dalfresco.host=${PROXY_HOST}
|
||||||
-Dalfresco.port=${PROXY_PORT}
|
-Dalfresco.port=${PROXY_PORT}
|
||||||
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
||||||
|
-Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
|
||||||
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
||||||
|
-Ddeployment.method=DOCKER_COMPOSE
|
||||||
|
-Dcsrf.filter.enabled=false
|
||||||
|
-Dcors.enabled=false
|
||||||
|
-Dtransform.service.enabled=false
|
||||||
|
-Dlocal.transform.service.enabled=false
|
||||||
|
-Dsystem.content.eagerOrphanCleanup=true
|
||||||
|
-Dsystem.content.orphanProtectDays=0
|
||||||
|
-Djodconverter.enabled=false
|
||||||
"
|
"
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres-acs
|
- postgres-acs
|
||||||
@ -33,6 +49,11 @@ services:
|
|||||||
|
|
||||||
postgres-acs:
|
postgres-acs:
|
||||||
image: postgres:${POSTGRES_TAG}
|
image: postgres:${POSTGRES_TAG}
|
||||||
|
environment:
|
||||||
|
POSTGRES_PASSWORD: alfresco
|
||||||
|
POSTGRES_USER: alfresco
|
||||||
|
POSTGRES_DB: alfresco
|
||||||
|
command: postgres -c max_connections=300 -c log_min_messages=LOG
|
||||||
volumes:
|
volumes:
|
||||||
- acsdb-volume:/var/lib/postgresql/data:rw
|
- acsdb-volume:/var/lib/postgresql/data:rw
|
||||||
|
|
||||||
@ -41,6 +62,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
SOLR_ALFRESCO_HOST: platform
|
SOLR_ALFRESCO_HOST: platform
|
||||||
SOLR_SOLR_HOST: search
|
SOLR_SOLR_HOST: search
|
||||||
|
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
|
||||||
ALFRESCO_SECURE_COMMS: secret
|
ALFRESCO_SECURE_COMMS: secret
|
||||||
JAVA_TOOL_OPTIONS: "
|
JAVA_TOOL_OPTIONS: "
|
||||||
-Dalfresco.secureComms.secret=alfresco-secret
|
-Dalfresco.secureComms.secret=alfresco-secret
|
||||||
@ -50,12 +72,17 @@ services:
|
|||||||
|
|
||||||
activemq:
|
activemq:
|
||||||
image: alfresco/alfresco-activemq:${AAMQ_TAG}
|
image: alfresco/alfresco-activemq:${AAMQ_TAG}
|
||||||
|
environment:
|
||||||
|
ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
|
||||||
|
ACTIVEMQ_ADMIN_LOGIN: alfresco
|
||||||
|
ACTIVEMQ_ADMIN_PASSWORD: alfresco
|
||||||
volumes:
|
volumes:
|
||||||
- activemq-volume:/opt/activemq/data:rw
|
- activemq-volume:/opt/activemq/data:rw
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
image: local/nginx-ingress:acs
|
image: local/nginx-ingress:acs
|
||||||
|
mem_limit: 256m
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
depends_on:
|
depends_on:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user