Merge pull request #15 from Alfresco/merge/Merged_changes_from_1.1.0.x_to_master

SEARCH-722 (Fix Docker config files for Search 1.1.x branch)

search-services/packaging/buildAndTest.sh

@@ -5,7 +5,7 @@ set -e
 
 nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'`
 
-if [ "${nicebranch}" = "master" ]
+if [ "${nicebranch}" = "master" ] || [ "${nicebranch#release}" != "${nicebranch}" ]
 then
    # set current working directory to the directory of the script
    cd "$bamboo_working_directory"

search-services/packaging/src/docker/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - "8082:8080" #Browser port for Share
       - "8084:8080" #Browser port for API Explorer
   search:
-    image: quay.io/alfresco/search-services:1.2.0-SNAPSHOT
+    image: quay.io/alfresco/search-services:${project.version}
     environment:
       #Solr needs to know how to register itself with Alfresco
       SOLR_ALFRESCO_HOST: platform