diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh index d798bc7ca..5b2bd2428 100755 --- a/search-services/packaging/buildAndTest.sh +++ b/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" diff --git a/search-services/packaging/src/docker/docker-compose.yml b/search-services/packaging/src/docker/docker-compose.yml index 8a00ade17..7d1e20919 100644 --- a/search-services/packaging/src/docker/docker-compose.yml +++ b/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