diff --git a/pom.xml b/pom.xml index 3409af13e5..e962738f37 100644 --- a/pom.xml +++ b/pom.xml @@ -401,7 +401,7 @@ org.alfresco share 8.15 - 7.0.0-A4 + 7.0.0 0.0 @@ -465,7 +465,7 @@ 4.0.1 1.19 - 8.408 + 8.423 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index f7879e280d..f3ad143e62 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -75,7 +75,7 @@ 5.3.3 7.0.0 - 7.0.0-A18 + 7.0.0 true diff --git a/rm-community/rm-community-repo/.env b/rm-community/rm-community-repo/.env index 160201f67a..bf5f645726 100644 --- a/rm-community/rm-community-repo/.env +++ b/rm-community/rm-community-repo/.env @@ -1,6 +1,4 @@ -TRANSFORMERS_TAG=2.3.6 +TRANSFORMERS_TAG=2.3.10 SOLR6_TAG=2.0.1 -POSTGRES_TAG=11.7 -ACTIVEMQ_TAG=5.15.8 -LEGACY_TRANSFORM_SERVICE_ENABLED=true -LOCAL_TRANSFORM_SERVICE_ENABLED=true \ No newline at end of file +POSTGRES_TAG=13.1 +ACTIVEMQ_TAG=5.16.1 diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile index fd8a63f1fa..c84555e497 100644 --- a/rm-community/rm-community-repo/Dockerfile +++ b/rm-community/rm-community-repo/Dockerfile @@ -1,5 +1,5 @@ ### Apply AGS community repo AMP to ACS image -FROM quay.io/alfresco/alfresco-content-repository-community:latest +FROM quay.io/alfresco/alfresco-content-repository-community:7.0.0 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root. # The access will be fixed after all operations are done. @@ -24,4 +24,4 @@ RUN chgrp -R Alfresco /usr/local/tomcat && \ chmod -R g+r /usr/local/tomcat/webapps # Switching back to alfresco user after having added amps files to run the container as non-root -USER alfresco \ No newline at end of file +USER alfresco diff --git a/rm-community/rm-community-repo/docker-compose.yml b/rm-community/rm-community-repo/docker-compose.yml index 687dcfa2a6..bac5396290 100644 --- a/rm-community/rm-community-repo/docker-compose.yml +++ b/rm-community/rm-community-repo/docker-compose.yml @@ -39,18 +39,7 @@ services: -Dshare.host=localhost -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\" - -Dlocal.transform.service.enabled=${LOCAL_TRANSFORM_SERVICE_ENABLED} - -DlocalTransform.pdfrenderer.url=http://alfresco-pdf-renderer:8090/ - -DlocalTransform.imagemagick.url=http://imagemagick:8090/ - -DlocalTransform.libreoffice.url=http://libreoffice:8090/ - -DlocalTransform.tika.url=http://tika:8090/ - -DlocalTransform.misc.url=http://transform-misc:8090/ - -Dlegacy.transform.service.enabled=${LEGACY_TRANSFORM_SERVICE_ENABLED} - -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/ - -Djodconverter.url=http://libreoffice:8090/ - -Dimg.url=http://imagemagick:8090/ - -Dtika.url=http://tika:8090/ - -Dtransform.misc.url=http://transform-misc:8090/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ " ports: - 8080:8080 @@ -59,41 +48,6 @@ services: - "21:1221" - "30000-30099:30000-30099" - alfresco-pdf-renderer: - image: alfresco/alfresco-pdf-renderer:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8090:8090 - - imagemagick: - image: alfresco/alfresco-imagemagick:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8091:8090 - - libreoffice: - image: alfresco/alfresco-libreoffice:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8092:8090 - - tika: - image: alfresco/alfresco-tika:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8093:8090 - - transform-misc: - image: alfresco/alfresco-transform-misc:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8094:8090 - postgres: image: library/postgres:${POSTGRES_TAG} environment: @@ -125,4 +79,11 @@ services: - 8161:8161 # Web Console - 5672:5672 # AMQP - 61616:61616 # OpenWire - - 61613:61613 # STOMP \ No newline at end of file + - 61613:61613 # STOMP + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG} + environment: + JAVA_OPTS: " -Xms256m -Xmx512m" + ports: + - 8090:8090