inteligr8/env-docker-alfresco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'acs-base.proxy' into acs-share-base.acs-base

Browse Source
This commit is contained in:
Brian Long 2020-12-26 13:56:13 -05:00
commit f2ac689f85
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.env
View File

@ -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

18
docker-compose.yml
View File

@ -10,12 +10,12 @@ services:
JAVA_OPTS: " JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver -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.host=${PROXY_HOST}
-Dshare.port=${PROXY_SHARE_PORT} -Dshare.port=${PROXY_PORT}
-Dshare.protocol=${PROXY_SHARE_PROTOCOL} -Dshare.protocol=${PROXY_PROTOCOL}
-Dalfresco.host=${PROXY_PLATFORM_HOST} -Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PLATFORM_PORT} -Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL} -Dalfresco.protocol=${PROXY_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:
@ -27,9 +27,9 @@ services:
environment: environment:
REPO_HOST: "platform" REPO_HOST: "platform"
JAVA_OPTS: " JAVA_OPTS: "
-Dalfresco.host=${PROXY_PLATFORM_HOST} -Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PLATFORM_PORT} -Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL} -Dalfresco.protocol=${PROXY_PROTOCOL}
" "
postgres-acs: postgres-acs: