inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-2885 update readme, add script to init .env files and fix all docker-compose.yml files to work with 6.x and 7.x

Browse Source
This commit is contained in:
dcerbo
2021-07-05 15:46:41 +02:00
parent c08f591c01
commit 725b48ea2b
21 changed files with 92 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/.gitignore
+1 -1
View File
@@ -37,4 +37,4 @@ qa/search/upgrade/solr-data
qa/search/upgrade/solr-contentstore
qa/upgrade/upgrade
e2e-test/release-testing/**/.env
release-testing/**/.env
e2e-test/release-testing/6.2.2.env
Executable
+16
View File
@@ -0,0 +1,16 @@
ALFRESCO_TAG=6.2.2
ALFRESCO_CE_TAG=6.2.0-ga
SHARE_TAG=6.2.1
POSTGRES_TAG=11.4
TRANSFORM_ROUTER_TAG=1.2.0
TRANSFORM_CORE_AIO_TAG=2.2.1
TRANSFORMER_TAG=2.1.0
SHARED_FILE_STORE_TAG=0.7.0
ACTIVE_MQ_TAG=5.15.8
DIGITAL_WORKSPACE_TAG=1.5.0
ACS_NGINX_TAG=3.0.1
ACS_COMMUNITY_NGINX_TAG=1.0.0
SEARCH_TAG=2.0.0-RC3
ZEPPELIN_TAG=latest
ACA_TAG=master-latest
e2e-test/release-testing/7.1.0-A8.env
Executable
+25
View File
@@ -0,0 +1,25 @@
ALFRESCO_TAG=7.1.0-A8
ALFRESCO_CE_TAG=7.1.0-A8
SHARE_TAG=7.1.0-A8
POSTGRES_TAG=11.4
TRANSFORM_ROUTER_TAG=1.2.0
TRANSFORM_CORE_AIO_TAG=2.2.1
TRANSFORMER_TAG=2.1.0
SHARED_FILE_STORE_TAG=0.7.0
ACTIVE_MQ_TAG=5.15.8
DIGITAL_WORKSPACE_TAG=1.5.0
ACS_NGINX_TAG=3.0.1
ACS_COMMUNITY_NGINX_TAG=1.0.0
SEARCH_TAG=2.0.2-RC1
ZEPPELIN_TAG=latest
ACA_TAG=master-latest
#To test versions before 7, please leave this property empty
JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=DESede
-Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
-Dmetadata-keystore.metadata.algorithm=DESede"
e2e-test/release-testing/README.md
+26 -8
View File
@@ -3,7 +3,7 @@
This project includes a collection of Docker Compose Templates to test Repository and Search Services/Insight Engine with different configurations.
Test execution information is available in [Test Execution internal wiki page](https://w3.alfresco.com/confluence/display/ENG/Test+Execution).
Test execution information is available in [Test Execution internal wiki page](https://alfresco.atlassian.net/wiki/spaces/ENG/pages/398881/Test+Execution).
## Project structure
@@ -28,12 +28,20 @@ Configurations have been generated mainly with [generator-alfresco-docker-compos
## Docker Compose templates
Every Docker Compose folder includes a `.env` file with versions settings.
Before executing the test you have init the docker-compose env file. To perform this operation run the init.sh script followed by the Alfresco version do you have to test, e.g.:
```
ALFRESCO_TAG=6.2.2
ALFRESCO_CE_TAG=6.2.0-ga
SHARE_TAG=6.2.1
$ init.sh 6.6.2
```
To create new configuration you need to create a file in this folder with the version as name and the .env extension.
After this command execution, every Docker Compose folder includes a `.env` file with versions settings like below:
```
ALFRESCO_TAG=7.1.0-A8
ALFRESCO_CE_TAG=7.1.0-A8
SHARE_TAG=7.1.0-A8
POSTGRES_TAG=11.4
TRANSFORM_ROUTER_TAG=1.2.0
TRANSFORM_CORE_AIO_TAG=2.2.1
@@ -43,12 +51,22 @@ ACTIVE_MQ_TAG=5.15.8
DIGITAL_WORKSPACE_TAG=1.5.0
ACS_NGINX_TAG=3.0.1
ACS_COMMUNITY_NGINX_TAG=1.0.0
SEARCH_TAG=1.4.3.0-RC1
ZEPPELIN_TAG=1.4.3.0-RC1
SEARCH_TAG=2.0.2-RC1
ZEPPELIN_TAG=latest
ACA_TAG=master-latest
#To test versions before 7, please leave this property empty
JAVA_TOOL_OPTIONS= "-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=DESede
-Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
-Dmetadata-keystore.metadata.algorithm=DESede"
```
Version number must be changed when execution the tests on a new release. Additionally, Docker Compose templates may need some modifications in order to be adapted to new configurations.
Docker Compose templates may need some modifications in order to be adapted to new configurations.
Once started, services are available in following URLs:
e2e-test/release-testing/init.sh
+8
View File
@@ -0,0 +1,8 @@
ALF_VERSION=$1
echo "Copying .env for version $ALF_VERSION"
FOLDERS=$(find . -name 'docker-compose.yml' -exec dirname {} \;)
for d in $FOLDERS
do
cp "$ALF_VERSION.env" $d/.env
done
e2e-test/release-testing/insight-engine-sharding-replica/docker-compose.yml
+1 -3
View File
@@ -11,6 +11,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -22,11 +23,9 @@ services:
-Dsolr.baseUrl=/solr
-Dsolr.useDynamicShardRegistration=true
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -36,7 +35,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/insight-engine-zeppelin/docker-compose.yml
+1 -3
View File
@@ -10,6 +10,7 @@ services:
SOLR_COMMS: none
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -20,11 +21,9 @@ services:
-Dsolr.secureComms=none
-Dsolr.baseUrl=/solr
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -34,7 +33,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/insight-engine/docker-compose.yml
+1 -3
View File
@@ -11,6 +11,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -21,11 +22,9 @@ services:
-Dsolr.secureComms=none
-Dsolr.baseUrl=/solr
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -35,7 +34,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/mtls/insight-engine/docker-compose.yml
+1 -3
View File
@@ -14,6 +14,7 @@ services:
KEYSTORE_PASS: kT9X6oe68t
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -24,11 +25,9 @@ services:
-Dsolr.secureComms=https
-Dsolr.baseUrl=/solr
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -38,7 +37,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/mtls/search-services/docker-compose.yml
+1 -3
View File
@@ -16,6 +16,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -31,21 +32,18 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dlocal.transform.service.enabled=true
-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=true
-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/
-Dcsrf.filter.enabled=false
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-backup/master-master/docker-compose.yml
+1 -3
View File
@@ -11,6 +11,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -21,11 +22,9 @@ services:
-Dsolr.secureComms=none
-Dsolr.baseUrl=/solr
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -35,7 +34,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-backup/master-slave/docker-compose.yml
+1 -3
View File
@@ -11,6 +11,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -21,11 +22,9 @@ services:
-Dsolr.secureComms=none
-Dsolr.baseUrl=/solr
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -35,7 +34,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-backup/normal/docker-compose.yml
+1 -3
View File
@@ -12,6 +12,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -27,21 +28,18 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dlocal.transform.service.enabled=true
-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=true
-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/
-Dcsrf.filter.enabled=false
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-backup/sharding/docker-compose.yml
+1 -3
View File
@@ -11,6 +11,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -22,11 +23,9 @@ services:
-Dsolr.baseUrl=/solr
-Dsolr.useDynamicShardRegistration=true
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -36,7 +35,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-disable-tracking/docker-compose.yml
+1 -3
View File
@@ -12,6 +12,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -27,21 +28,18 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dlocal.transform.service.enabled=true
-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=true
-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/
-Dcsrf.filter.enabled=false
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-replication/master-master/docker-compose.yml
+1 -3
View File
@@ -11,6 +11,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -21,11 +22,9 @@ services:
-Dsolr.secureComms=none
-Dsolr.baseUrl=/solr
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -35,7 +34,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-replication/master-slave/docker-compose.yml
+1 -3
View File
@@ -11,6 +11,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -21,11 +22,9 @@ services:
-Dsolr.secureComms=none
-Dsolr.baseUrl=/solr
-Dindex.subsystem.name=solr6
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
@@ -35,7 +34,6 @@ services:
-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
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-upgrade/current-ie/docker-compose.yml
+1 -3
View File
@@ -12,6 +12,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -27,21 +28,18 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dlocal.transform.service.enabled=true
-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=true
-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/
-Dcsrf.filter.enabled=false
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-upgrade/current/docker-compose.yml
+1 -3
View File
@@ -12,6 +12,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -27,21 +28,18 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dlocal.transform.service.enabled=true
-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=true
-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/
-Dcsrf.filter.enabled=false
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services-upgrade/previous/docker-compose.yml
+1 -3
View File
@@ -12,6 +12,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -27,21 +28,18 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dlocal.transform.service.enabled=true
-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=true
-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/
-Dcsrf.filter.enabled=false
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
e2e-test/release-testing/search-services/docker-compose.yml
+1 -3
View File
@@ -12,6 +12,7 @@ services:
COMPRESS_CONTENT: "false"
mem_limit: 1800m
environment:
JAVA_TOOL_OPTIONS: "${JAVA_TOOL_OPTIONS}"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -27,21 +28,18 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dlocal.transform.service.enabled=true
-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=true
-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/
-Dcsrf.filter.enabled=false
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m