From a420c06f0fb71e5cfc2a01e493a63b73671e181f Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Thu, 19 Jan 2017 17:51:14 +0100
Subject: [PATCH] Updated the docker-compose file

---
 .../packaging/src/docker/compose-alpine.yml   | 31 +++++++++++++++++++
 .../packaging/src/docker/docker-compose.yml   |  8 ++---
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 search-services/packaging/src/docker/compose-alpine.yml

diff --git a/search-services/packaging/src/docker/compose-alpine.yml b/search-services/packaging/src/docker/compose-alpine.yml
new file mode 100644
index 000000000..3d3340e24
--- /dev/null
+++ b/search-services/packaging/src/docker/compose-alpine.yml
@@ -0,0 +1,31 @@
+version: '2'
+services:
+  repo:
+    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"
+    ports:
+          - "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
+          - "5005:5005" #Java debugging
+          - "8082:8080" #Browser port
+  share:
+    image: docker-internal.alfresco.com/share:5.2.d
+    ports:
+      - "8081:8080"
+    environment:
+      - "REPO_HOST=repo:8080"
+  solr6:
+    image: docker-internal.alfresco.com/search-services:1.0.b
+    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
+
+      #Create the default alfresco and archive cores
+      SOLR_CREATE_ALFRESCO_DEFAULTS : alfresco,archive
+    ports:
+      - "8083:8983" #Browser port
\ No newline at end of file
diff --git a/search-services/packaging/src/docker/docker-compose.yml b/search-services/packaging/src/docker/docker-compose.yml
index abd030eed..e6251d656 100644
--- a/search-services/packaging/src/docker/docker-compose.yml
+++ b/search-services/packaging/src/docker/docker-compose.yml
@@ -9,14 +9,14 @@ services:
           - "5005:5005" #Java debugging
           - "8082:8080" #Browser port
   share:
-    image: docker-internal.alfresco.com/share:5.2.1-demo
+    image: docker-internal.alfresco.com/share:5.2.d
     ports:
       - "8081:8080"
     environment:
       - "REPO_HOST=repo:8080"
   solr6:
-    image: docker-internal.alfresco.com/search-services:develop-latest
-    command: [ "/opt/alfresco-solr/solr/bin/solr", "start", "-f", "-p","8183", "-a",
+    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"
@@ -28,7 +28,7 @@ services:
       SOLR_SOLR_HOST: solr6
       #SOLR_SOLR_PORT: 8983
       #Create the default alfresco and archive cores
-      SOLR_CREATE_ALFRESCO_DEFAULTS : alfresco,archive,version
+      SOLR_CREATE_ALFRESCO_DEFAULTS : alfresco,archive
     ports:
       - "8083:8183" #Browser port
       - "1044:1044" #Java debugging