Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ACS-2564] update docker-compose and community-docker-compose to use solr with secureComms=secret #655

Merged
merged 3 commits into from
Feb 22, 2022
Merged

[ACS-2564] update docker-compose and community-docker-compose to use solr with secureComms=secret #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c78376b
[ACS-2564] update docker-compose and community-docker-compose to use …
aonych Feb 18, 2022
a58b979
[ACS-2564] fix alfresco-content-repository version
aonych Feb 21, 2022
4ef7232
[ACS-2564] change SOLR_OPTS to JAVA_TOOL_OPTIONS
aonych Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions docker-compose/community-docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version: "2"
services:
alfresco:
image: alfresco/alfresco-content-repository-community:7.2.0-M2
mem_limit: 1500m
mem_limit: 1600m
environment:
JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS
Expand All @@ -31,7 +31,8 @@ services:
-Dsolr.host=solr6
-Dsolr.port=8983
-Dsolr.http.connection.timeout=1000
-Dsolr.secureComms=none
-Dsolr.secureComms=secret
-Dsolr.sharedSecret=secret
-Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6
-Dshare.host=127.0.0.1
Expand Down Expand Up @@ -81,19 +82,23 @@ services:
- "5432:5432"

solr6:
image: alfresco/alfresco-search-services:2.0.2
image: quay.io/alfresco/search-services:2.1.0-SNAPSHOT
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco
- SOLR_ALFRESCO_PORT=8080
SOLR_ALFRESCO_HOST: "alfresco"
SOLR_ALFRESCO_PORT: "8080"
# Alfresco needs to know how to call solr
- SOLR_SOLR_HOST=solr6
- SOLR_SOLR_PORT=8983
SOLR_SOLR_HOST: "solr6"
SOLR_SOLR_PORT: "8983"
# Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
# HTTP by default
- ALFRESCO_SECURE_COMMS=none
SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
# HTTPS or SECRET
ALFRESCO_SECURE_COMMS: "secret"
# SHARED SECRET VALUE
JAVA_TOOL_OPTIONS: "
-Dalfresco.secureComms.secret=secret
"
ports:
- "8083:8983" # Browser port

Expand Down
23 changes: 14 additions & 9 deletions docker-compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ services:
-Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-Dsolr.host=solr6
-Dsolr.port=8983
-Dsolr.secureComms=none
-Dsolr.secureComms=secret
-Dsolr.sharedSecret=secret
-Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6
-Dshare.host=127.0.0.1
Expand Down Expand Up @@ -115,19 +116,23 @@ services:
- "5432:5432"

solr6:
image: alfresco/alfresco-search-services:2.0.2
image: quay.io/alfresco/search-services:2.1.0-SNAPSHOT
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco
- SOLR_ALFRESCO_PORT=8080
SOLR_ALFRESCO_HOST: "alfresco"
SOLR_ALFRESCO_PORT: "8080"
# Alfresco needs to know how to call solr
- SOLR_SOLR_HOST=solr6
- SOLR_SOLR_PORT=8983
SOLR_SOLR_HOST: "solr6"
SOLR_SOLR_PORT: "8983"
# Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
# HTTP by default
- ALFRESCO_SECURE_COMMS=none
SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
# HTTPS or SECRET
ALFRESCO_SECURE_COMMS: "secret"
# SHARED SECRET VALUE
JAVA_TOOL_OPTIONS: "
-Dalfresco.secureComms.secret=secret
"
ports:
- "8083:8983" # Browser port

Expand Down