Switched around the docker-compose files

This commit is contained in:
Gethin James
2017-03-24 16:49:24 +01:00
parent bd2a16f8ed
commit 1cc7b8dd00
2 changed files with 22 additions and 22 deletions
@@ -1,10 +1,9 @@
version: '2'
services:
repo:
image: docker-internal.alfresco.com/platform:5.2.1-SNAPSHOT
image: docker-internal.alfresco.com/platform:latest
environment:
JAVA_OPTS : "-Dsolr.host=solr6 -Dsolr.port=8983 -Dsolr.secureComms=none
-Dsolr.base.url=/solr -Dindex.subsystem.name=solr6"
JAVA_OPTS : "-Dsolr.secureComms=none -Dsolr.useDynamicShardRegistration=true -Dsearch.solrTrackingSupport.ignorePathsForSpecificTypes=true"
ports:
- "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
- "5005:5005" #Java debugging
@@ -15,21 +14,22 @@ services:
- "8081:8080"
environment:
- "REPO_HOST=repo:8080"
depends_on:
- repo
solr6:
image: docker-internal.alfresco.com/search-services:1.1.0-SNAPSHOT
image: docker-internal.alfresco.com/search-services:1.0.b
command: [ "/opt/alfresco-search/solr/bin/solr", "start", "-f", "-p","8183", "-a",
"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"]
expose:
- "8183"
environment:
#Solr needs to know how to register itself with Alfresco
SOLR_ALFRESCO_HOST: repo
SOLR_ALFRESCO_PORT: 8080
#Alfresco needs to know how to call solr
SOLR_SOLR_HOST: solr6
SOLR_SOLR_PORT: 8983
#SOLR_SOLR_PORT: 8983
#Create the default alfresco and archive cores
SOLR_CREATE_ALFRESCO_DEFAULTS : alfresco,archive
depends_on:
- repo
ports:
- "8083:8983" #Browser port
- "8083:8183" #Browser port
- "1044:1044" #Java debugging
#In the Index Server Shard Management Admin console the index server is: solr6:8983/solr
+11 -11
View File
@@ -1,9 +1,10 @@
version: '2'
services:
repo:
image: docker-internal.alfresco.com/platform:latest
image: docker-internal.alfresco.com/platform:5.2.1-SNAPSHOT
environment:
JAVA_OPTS : "-Dsolr.secureComms=none -Dsolr.useDynamicShardRegistration=true -Dsearch.solrTrackingSupport.ignorePathsForSpecificTypes=true"
JAVA_OPTS : "-Dsolr.host=solr6 -Dsolr.port=8983 -Dsolr.secureComms=none
-Dsolr.base.url=/solr -Dindex.subsystem.name=solr6"
ports:
- "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
- "5005:5005" #Java debugging
@@ -14,22 +15,21 @@ services:
- "8081:8080"
environment:
- "REPO_HOST=repo:8080"
depends_on:
- repo
solr6:
image: docker-internal.alfresco.com/search-services:1.0.b
command: [ "/opt/alfresco-search/solr/bin/solr", "start", "-f", "-p","8183", "-a",
"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"]
expose:
- "8183"
image: docker-internal.alfresco.com/search-services:1.1.0-SNAPSHOT
environment:
#Solr needs to know how to register itself with Alfresco
SOLR_ALFRESCO_HOST: repo
SOLR_ALFRESCO_PORT: 8080
#Alfresco needs to know how to call solr
SOLR_SOLR_HOST: solr6
#SOLR_SOLR_PORT: 8983
SOLR_SOLR_PORT: 8983
#Create the default alfresco and archive cores
SOLR_CREATE_ALFRESCO_DEFAULTS : alfresco,archive
depends_on:
- repo
ports:
- "8083:8183" #Browser port
- "1044:1044" #Java debugging
#In the Index Server Shard Management Admin console the index server is: solr6:8983/solr
- "8083:8983" #Browser port