Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community
This commit is contained in:
commit
82b58f638c
9
.env
9
.env
@ -2,9 +2,6 @@ EXTERNAL_RESOURCE_DIR=~
|
|||||||
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
|
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
|
||||||
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
|
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
|
||||||
|
|
||||||
PROXY_PLATFORM_PROTOCOL=http
|
PROXY_PROTOCOL=http
|
||||||
PROXY_PLATFORM_HOST=localhost
|
PROXY_HOST=localhost
|
||||||
PROXY_PLATFORM_PORT=8080
|
PROXY_PORT=8080
|
||||||
PROXY_SHARE_PROTOCOL=http
|
|
||||||
PROXY_SHARE_HOST=localhost
|
|
||||||
PROXY_SHARE_PORT=8080
|
|
||||||
|
@ -14,12 +14,9 @@ services:
|
|||||||
-Ddb.password=alfresco
|
-Ddb.password=alfresco
|
||||||
-Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
|
-Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
|
||||||
-Dindex.subsystem.name=noindex
|
-Dindex.subsystem.name=noindex
|
||||||
-Dshare.host=${PROXY_SHARE_HOST}
|
-Dalfresco.host=${PROXY_HOST}
|
||||||
-Dshare.port=${PROXY_SHARE_PORT}
|
-Dalfresco.port=${PROXY_PORT}
|
||||||
-Dshare.protocol=${PROXY_SHARE_PROTOCOL}
|
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
||||||
-Dalfresco.host=${PROXY_PLATFORM_HOST}
|
|
||||||
-Dalfresco.port=${PROXY_PLATFORM_PORT}
|
|
||||||
-Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL}
|
|
||||||
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
|
-Daos.baseUrlOverwrite=http://localhost:8080/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
|
-Ddeployment.method=DOCKER_COMPOSE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user