diff --git a/alfresco-content-repository/docker/Dockerfile b/alfresco-content-repository/docker/Dockerfile index fdc4bab..b2148f3 100644 --- a/alfresco-content-repository/docker/Dockerfile +++ b/alfresco-content-repository/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alfresco/alfresco-content-repository:latest +FROM alfresco/alfresco-content-repository-community:6.2.0-ga ARG USERNAME=alfresco ARG TOMCAT_DIR=/usr/local/tomcat diff --git a/alfresco-share/docker/Dockerfile b/alfresco-share/docker/Dockerfile index 177661b..fc62dec 100644 --- a/alfresco-share/docker/Dockerfile +++ b/alfresco-share/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alfresco/alfresco-share:latest +FROM alfresco/alfresco-share:6.2.2 ARG TOMCAT_DIR=/usr/local/tomcat diff --git a/docker-compose.yml b/docker-compose.yml index f112ece..2c84d0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,11 +6,39 @@ version: "2" services: platform: build: ./alfresco-content-repository/docker - image: local/alfresco-content-repository:latest + image: local/alfresco-content-repository:6.2.0-ga + mem_limit: 1700m environment: JAVA_OPTS: " + -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.port=8983 + -Dsolr.secureComms=none + -Dshare.host=localhost + -Dshare.port=8080 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ + -Djodconverter.url=http://transform-core-aio:8090/ + -Dimg.url=http://transform-core-aio:8090/ + -Dtika.url=http://transform-core-aio:8090/ + -Dtransform.misc.url=http://transform-core-aio:8090/ + -Dcsrf.filter.enabled=false + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + + -Dtransform.service.enabled=false + + -Dsystem.content.eagerOrphanCleanup=true + -Dsystem.content.orphanProtectDays=0 + -Djodconverter.enabled=false " depends_on: - postgres-acs @@ -18,19 +46,45 @@ services: volumes: - "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro" + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.3.6 + share: build: ./alfresco-share/docker - image: local/alfresco-share:latest + image: local/alfresco-share:6.2.2 + mem_limit: 512m environment: REPO_HOST: "platform" + JAVA_OPTS: " + -Dalfresco.host=localhost + -Dalfresco.port=8080 + " volumes: - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro" postgres-acs: - image: postgres:latest + image: postgres:11.7 + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - 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:latest + image: alfresco/alfresco-activemq:5.15.8 + mem_limit: 256m proxy: build: ./nginx-ingress