mirror of
https://github.com/Alfresco/SearchServices.git
synced 2025-09-17 14:21:20 +00:00
SEARCH-2885 use a variable in order to use the same docker-compose file for 6.x and 7.x
This commit is contained in:
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
|
|||||||
SEARCH_TAG=2.0.2-RC1
|
SEARCH_TAG=2.0.2-RC1
|
||||||
ZEPPELIN_TAG=latest
|
ZEPPELIN_TAG=latest
|
||||||
ACA_TAG=master-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"
|
@@ -11,16 +11,7 @@ services:
|
|||||||
COMPRESS_CONTENT: "false"
|
COMPRESS_CONTENT: "false"
|
||||||
mem_limit: 1800m
|
mem_limit: 1800m
|
||||||
environment:
|
environment:
|
||||||
JAVA_TOOL_OPTIONS: "
|
JAVA_TOOL_OPTIONS: "${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
|
|
||||||
"
|
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
-Ddb.driver=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
|
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
|
|||||||
SEARCH_TAG=2.0.2-RC1
|
SEARCH_TAG=2.0.2-RC1
|
||||||
ZEPPELIN_TAG=latest
|
ZEPPELIN_TAG=latest
|
||||||
ACA_TAG=master-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"
|
@@ -11,16 +11,7 @@ services:
|
|||||||
COMPRESS_CONTENT: "false"
|
COMPRESS_CONTENT: "false"
|
||||||
mem_limit: 1800m
|
mem_limit: 1800m
|
||||||
environment:
|
environment:
|
||||||
JAVA_TOOL_OPTIONS: "
|
JAVA_TOOL_OPTIONS: "${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
|
|
||||||
"
|
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
-Ddb.driver=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
|
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
|
|||||||
SEARCH_TAG=2.0.2-RC1
|
SEARCH_TAG=2.0.2-RC1
|
||||||
ZEPPELIN_TAG=latest
|
ZEPPELIN_TAG=latest
|
||||||
ACA_TAG=master-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"
|
@@ -11,16 +11,7 @@ services:
|
|||||||
COMPRESS_CONTENT: "false"
|
COMPRESS_CONTENT: "false"
|
||||||
mem_limit: 1800m
|
mem_limit: 1800m
|
||||||
environment:
|
environment:
|
||||||
JAVA_TOOL_OPTIONS: "
|
JAVA_TOOL_OPTIONS: "${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
|
|
||||||
"
|
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
-Ddb.driver=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
|
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
|
|||||||
SEARCH_TAG=2.0.0-RC3
|
SEARCH_TAG=2.0.0-RC3
|
||||||
ZEPPELIN_TAG=latest
|
ZEPPELIN_TAG=latest
|
||||||
ACA_TAG=master-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"
|
@@ -11,16 +11,7 @@ services:
|
|||||||
COMPRESS_CONTENT: "false"
|
COMPRESS_CONTENT: "false"
|
||||||
mem_limit: 1800m
|
mem_limit: 1800m
|
||||||
environment:
|
environment:
|
||||||
JAVA_TOOL_OPTIONS: "
|
JAVA_TOOL_OPTIONS: "${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
|
|
||||||
"
|
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
-Ddb.driver=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
|
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
|
|||||||
SEARCH_TAG=2.0.2-RC1
|
SEARCH_TAG=2.0.2-RC1
|
||||||
ZEPPELIN_TAG=latest
|
ZEPPELIN_TAG=latest
|
||||||
ACA_TAG=master-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"
|
@@ -11,16 +11,7 @@ services:
|
|||||||
COMPRESS_CONTENT: "false"
|
COMPRESS_CONTENT: "false"
|
||||||
mem_limit: 1800m
|
mem_limit: 1800m
|
||||||
environment:
|
environment:
|
||||||
JAVA_TOOL_OPTIONS: "
|
JAVA_TOOL_OPTIONS: "${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
|
|
||||||
"
|
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
-Ddb.driver=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
|
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
|
|||||||
SEARCH_TAG=2.0.2-RC1
|
SEARCH_TAG=2.0.2-RC1
|
||||||
ZEPPELIN_TAG=latest
|
ZEPPELIN_TAG=latest
|
||||||
ACA_TAG=master-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"
|
@@ -11,16 +11,7 @@ services:
|
|||||||
COMPRESS_CONTENT: "false"
|
COMPRESS_CONTENT: "false"
|
||||||
mem_limit: 1800m
|
mem_limit: 1800m
|
||||||
environment:
|
environment:
|
||||||
JAVA_TOOL_OPTIONS: "
|
JAVA_TOOL_OPTIONS: "${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
|
|
||||||
"
|
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
-Ddb.driver=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
|
@@ -13,3 +13,13 @@ ACS_COMMUNITY_NGINX_TAG=1.0.0
|
|||||||
SEARCH_TAG=2.0.2-RC1
|
SEARCH_TAG=2.0.2-RC1
|
||||||
ZEPPELIN_TAG=latest
|
ZEPPELIN_TAG=latest
|
||||||
ACA_TAG=master-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"
|
@@ -11,16 +11,7 @@ services:
|
|||||||
COMPRESS_CONTENT: "false"
|
COMPRESS_CONTENT: "false"
|
||||||
mem_limit: 1800m
|
mem_limit: 1800m
|
||||||
environment:
|
environment:
|
||||||
JAVA_TOOL_OPTIONS: "
|
JAVA_TOOL_OPTIONS: "${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
|
|
||||||
"
|
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
-Ddb.driver=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
|
Reference in New Issue
Block a user