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