Merge branch 'acs-base.proxy' into acs-persist.acs-base
This commit is contained in:
commit
5beadf9f35
11
.env
11
.env
@ -1,3 +1,10 @@
|
|||||||
BASEDIR=~
|
EXTERNAL_RESOURCE_DIR=~
|
||||||
ALFRESCO_DIR=${BASEDIR}/alfresco
|
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
|
||||||
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
|
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
|
||||||
|
|
||||||
|
PROXY_PLATFORM_PROTOCOL=http
|
||||||
|
PROXY_PLATFORM_HOST=localhost
|
||||||
|
PROXY_PLATFORM_PORT=8080
|
||||||
|
PROXY_SHARE_PROTOCOL=http
|
||||||
|
PROXY_SHARE_HOST=localhost
|
||||||
|
PROXY_SHARE_PORT=8080
|
||||||
|
@ -8,7 +8,14 @@ services:
|
|||||||
image: alfresco/alfresco-content-repository:latest
|
image: alfresco/alfresco-content-repository:latest
|
||||||
environment:
|
environment:
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
||||||
|
-Dshare.host=${PROXY_SHARE_HOST}
|
||||||
|
-Dshare.port=${PROXY_SHARE_PORT}
|
||||||
|
-Dshare.protocol=${PROXY_SHARE_PROTOCOL}
|
||||||
|
-Dalfresco.host=${PROXY_PLATFORM_HOST}
|
||||||
|
-Dalfresco.port=${PROXY_PLATFORM_PORT}
|
||||||
|
-Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL}
|
||||||
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
||||||
"
|
"
|
||||||
depends_on:
|
depends_on:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user