From cf8f49332c9f7a8e9942b9c7aa5d26e31ef5634c Mon Sep 17 00:00:00 2001
From: ciprianchelaru <ciprian.chelaru.is@gmail.com>
Date: Thu, 14 Jun 2018 17:03:42 +0300
Subject: [PATCH 1/2] update share to 6.0.b released version

---
 docker-alfresco/test/.env     | 2 +-
 docker-alfresco/test/test.env | 2 +-
 pom.xml                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-alfresco/test/.env b/docker-alfresco/test/.env
index e814763dc..ad8589921 100644
--- a/docker-alfresco/test/.env
+++ b/docker-alfresco/test/.env
@@ -1,5 +1,5 @@
 ALFRESCO_TAG=latest
-SHARE_TAG=6.0.a
+SHARE_TAG=6.0.b
 SOLR6_TAG=1.1.1
 POSTGRES_TAG=10.1
 REGISTRY=
\ No newline at end of file
diff --git a/docker-alfresco/test/test.env b/docker-alfresco/test/test.env
index c49cb6747..8337d0ee5 100644
--- a/docker-alfresco/test/test.env
+++ b/docker-alfresco/test/test.env
@@ -1,5 +1,5 @@
 export ALFRESCO_TAG=latest
-export SHARE_TAG=6.0.a
+export SHARE_TAG=6.0.b
 export SOLR6_TAG=1.1.1
 export POSTGRES_TAG=10.1
 export REGISTRY=
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d8c1b7a1e..be3d1ab96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
 
         <!-- Alfresco Share version -->
         <alfresco.share.version>6.0.0-rc2</alfresco.share.version>
-        <alfresco.alfresco-share-services.version>6.0.a</alfresco.alfresco-share-services.version>
+        <alfresco.alfresco-share-services.version>6.0.b</alfresco.alfresco-share-services.version>
 
         <!-- Alfresco GoogleDocs integration version -->
         <alfresco.googledocs.version>3.1.0</alfresco.googledocs.version>

From 6720814e3a917ac1d42e164f74bec885035eae71 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 15 Jun 2018 14:35:11 +0100
Subject: [PATCH 2/2] ALF-22000 Share link on the /alfresco page had the wrong
 host.

---
 docker-alfresco/test/docker-compose.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-alfresco/test/docker-compose.yml b/docker-alfresco/test/docker-compose.yml
index 244407c35..e7f56aff0 100644
--- a/docker-alfresco/test/docker-compose.yml
+++ b/docker-alfresco/test/docker-compose.yml
@@ -28,6 +28,7 @@ services:
                 -Dftp.dataPortFrom=30000
                 -Dftp.dataPortTo=30099
                 -Dcifs.enabled=true
+                -Dshare.host=localhost
                 "
         ports:
             - 8082:8080
@@ -66,4 +67,4 @@ services:
             #Create the default alfresco and archive cores
             - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
         ports:
-            - 8083:8983 #Browser port
\ No newline at end of file
+            - 8083:8983 #Browser port