Merge branch 'master' of github.com:Alfresco/acs-community-packaging into Search-813

This commit is contained in:
Meenal Bhave
2018-04-27 10:53:45 +01:00
4 changed files with 27 additions and 64 deletions

View File

@@ -1,2 +1,6 @@
ALFRESCO_TAG=latest
SHARE_TAG=6.0.a
SOLR6_TAG=1.1.1
POSTGRES_TAG=10.1
REGISTRY=

View File

@@ -1,9 +1,17 @@
version: "3"
# The acs-community-deployment project contains the product version of docker-compose.
#
# This version is for testing and development use. For testing and debug we need to have a more open version.
# For remote debug we need the CATALINA_OPTS and to expose port 8000.
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository-community:${ALFRESCO_TAG}
image: ${REGISTRY}alfresco/alfresco-content-repository-community:${ALFRESCO_TAG}
environment:
CATALINA_OPTS : "
-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n
"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
@@ -22,14 +30,23 @@ services:
-Dcifs.enabled=true
"
ports:
- 8080:8080
- 8082:8080
- 8000:8000
- 445:445
- 143:143
- "21:21"
- "30000-30099:30000-30099"
share:
image: alfresco/alfresco-share:${SHARE_TAG}
environment:
- REPO_HOST=alfresco
- REPO_PORT=8080
ports:
- 8080:8080
postgres:
image: docker.io/library/postgres:10.1
image: library/postgres:${POSTGRES_TAG}
environment:
- POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco
@@ -38,7 +55,7 @@ services:
- 5432:5432
solr6:
image: quay.io/alfresco/search-services:${SOLR6_TAG}
image: alfresco/alfresco-search-services:${SOLR6_TAG}
environment:
#Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco

View File

@@ -2,3 +2,4 @@ export ALFRESCO_TAG=latest
export SHARE_TAG=6.0.a
export SOLR6_TAG=1.1.1
export POSTGRES_TAG=10.1
export REGISTRY=

View File

@@ -1,59 +0,0 @@
version: "3"
# The acs-community-deployment project contains the product version of docker-compose.
#
# This version is for testing and development use. For testing and debug we need to have a more open version.
# For remote debug we need the CATALINA_OPTS and to expose port 8000.
services:
alfresco:
image: alfresco/alfresco-content-repository-community:${ALFRESCO_TAG}
environment:
CATALINA_OPTS : "
-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n
"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
-Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-Dsolr.host=solr6
-Dsolr.port=8983
-Dsolr.secureComms=none
-Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6
"
ports:
- 8082:8080 #Browser port
- 8000:8000 #Debug port
share:
image: alfresco/alfresco-share:${SHARE_TAG}
environment:
- REPO_HOST=alfresco
- REPO_PORT=8080
ports:
- 8080:8080
postgres:
image: postgres:${POSTGRES_TAG}
environment:
- POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco
- POSTGRES_DB=alfresco
ports:
- 5432:5432
solr6:
image: alfresco/alfresco-search-services:${SOLR6_TAG}
environment:
#Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco
- SOLR_ALFRESCO_PORT=8080
#Alfresco needs to know how to call solr
- SOLR_SOLR_HOST=solr6
- SOLR_SOLR_PORT=8983
#Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
ports:
- 8083:8983 #Browser port