Merge pull request #557 from Alfresco/bug/551

Archetypes - Make ACS containers optional in share archetype
This commit is contained in:
Jose Luis Osorno 2019-03-25 15:15:57 +01:00 committed by GitHub
commit 10557e500d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,61 +8,62 @@ services:
context: ../../../target
environment:
CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
REPO_HOST: ${rootArtifactId}-acs
REPO_PORT: 8080
REPO_HOST: ${symbol_dollar}{acs.host}
REPO_PORT: ${symbol_dollar}{acs.port}
ports:
- "${symbol_dollar}{share.port}:8080"
- "${symbol_dollar}{share.debug.port}:8888"
${rootArtifactId}-acs:
image: ${symbol_dollar}{docker.acs.image}:${symbol_dollar}{alfresco.platform.version}
environment:
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
-Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
-Dsolr.host=${rootArtifactId}-ass
-Dsolr.port=8983
-Dsolr.secureComms=none
-Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6
-Dcsrf.filter.enabled=false
-Dmessaging.broker.url=\"vm://localhost?broker.persistent=false\"
"
ports:
- "${symbol_dollar}{acs.port}:8080"
volumes:
- ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data
depends_on:
- ${rootArtifactId}-postgres
${rootArtifactId}-postgres:
image: postgres:9.6
environment:
POSTGRES_DB: alfresco
POSTGRES_USER: alfresco
POSTGRES_PASSWORD: alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG
ports:
- "${symbol_dollar}{postgres.port}:5432"
volumes:
- ${rootArtifactId}-db-volume:/var/lib/postgresql/data
${rootArtifactId}-ass:
image: alfresco/alfresco-search-services:1.2.0
environment:
SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
SOLR_ALFRESCO_PORT: 8080
SOLR_SOLR_HOST: ${rootArtifactId}-ass
SOLR_SOLR_PORT: 8983
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
ports:
- "8983:8983"
volumes:
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
volumes:
${rootArtifactId}-acs-volume:
external: true
${rootArtifactId}-db-volume:
external: true
${rootArtifactId}-ass-volume:
external: true
# Optional
# ${rootArtifactId}-acs:
# image: ${symbol_dollar}{docker.acs.image}:${symbol_dollar}{alfresco.platform.version}
# environment:
# JAVA_OPTS: "
# -Ddb.driver=org.postgresql.Driver
# -Ddb.username=alfresco
# -Ddb.password=alfresco
# -Ddb.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
# -Dsolr.host=${rootArtifactId}-ass
# -Dsolr.port=8983
# -Dsolr.secureComms=none
# -Dsolr.base.url=/solr
# -Dindex.subsystem.name=solr6
# -Dcsrf.filter.enabled=false
# -Dmessaging.broker.url=\"vm://localhost?broker.persistent=false\"
# "
# ports:
# - "${symbol_dollar}{acs.port}:8080"
# volumes:
# - ${rootArtifactId}-acs-volume:/usr/local/tomcat/alf_data
# depends_on:
# - ${rootArtifactId}-postgres
# ${rootArtifactId}-postgres:
# image: postgres:9.6
# environment:
# POSTGRES_DB: alfresco
# POSTGRES_USER: alfresco
# POSTGRES_PASSWORD: alfresco
# command: postgres -c max_connections=300 -c log_min_messages=LOG
# ports:
# - "${symbol_dollar}{postgres.port}:5432"
# volumes:
# - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
# ${rootArtifactId}-ass:
# image: alfresco/alfresco-search-services:1.2.0
# environment:
# SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
# SOLR_ALFRESCO_PORT: 8080
# SOLR_SOLR_HOST: ${rootArtifactId}-ass
# SOLR_SOLR_PORT: 8983
# SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
# ports:
# - "8983:8983"
# volumes:
# - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
# - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
#volumes:
# ${rootArtifactId}-acs-volume:
# external: true
# ${rootArtifactId}-db-volume:
# external: true
# ${rootArtifactId}-ass-volume:
# external: true