Improved the docker image tests and README

This commit is contained in:
Gethin James
2017-01-31 15:41:29 +01:00
parent f9a3ac5e07
commit 5f83088d72
2 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ mvn clean install
```
### Docker
To build the docker image, first run the maven build then
To build the docker image:
```
cd packaging/src/docker
docker build --build-arg solrUrl=http://download.alfresco.com/release/community/201701-build-00015/alfresco-search-services-1.0.b.zip -t search-services:myimage .
+10 -10
View File
@@ -13,16 +13,16 @@ echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version
docker build --build-arg solrBranch=$nicebranch --build-arg solrVer=$bamboo_maven_version -t $dockerImage src/docker
echo "Running tests"
docker run --rm "$dockerImage" [ -d /opt/alfresco-solr/solr ] || (echo "solr dir does not exist" && exit 1)
docker run --rm "$dockerImage" [ -d /opt/alfresco-solr/data/content ] || (echo "content dir does not exist" && exit 1)
docker run --rm "$dockerImage" [ -d /opt/alfresco-solr/data/alfrescoModels ] || (echo "alfrescoModels dir does not exist" && exit 1)
docker run --rm "$dockerImage" [ -e /opt/alfresco-solr/solr.in.sh ] || (echo "solr.in.sh does not exist" && exit 1)
docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-solr/solr.in.sh || (echo "solr.in.sh does not contain Alfresco config" && exit 1)
docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-solr/solr.in.cmd || (echo "solr.in.cmd does not containAlfresco config" && exit 1)
docker run --rm "$dockerImage" grep -q LOG4J_PROPS /opt/alfresco-solr/solr.in.sh || (echo "solr.in.sh does not contain LOG4J_PROPS" && exit 1)
docker run --rm "$dockerImage" grep -q LOG4J_PROPS /opt/alfresco-solr/solr.in.cmd || (echo "solr.in.cmd does not contain LOG4J_PROPS" && exit 1)
docker run --rm "$dockerImage" [ -e /opt/alfresco-solr/solrhome/conf/shared.properties ] || (echo "shared.properties does not exist" && exit 1)
docker run --rm "$dockerImage" /opt/alfresco-solr/solr/bin/solr start
docker run --rm "$dockerImage" [ -d /opt/alfresco-search/solr ] || (echo "solr dir does not exist" && exit 1)
docker run --rm "$dockerImage" [ -d /opt/alfresco-search/data/content ] || (echo "content dir does not exist" && exit 1)
docker run --rm "$dockerImage" [ -d /opt/alfresco-search/data/alfrescoModels ] || (echo "alfrescoModels dir does not exist" && exit 1)
docker run --rm "$dockerImage" [ -e /opt/alfresco-search/solr.in.sh ] || (echo "solr.in.sh does not exist" && exit 1)
docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-search/solr.in.sh || (echo "solr.in.sh does not contain Alfresco config" && exit 1)
docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-search/solr.in.cmd || (echo "solr.in.cmd does not containAlfresco config" && exit 1)
docker run --rm "$dockerImage" grep -q LOG4J_PROPS /opt/alfresco-search/solr.in.sh || (echo "solr.in.sh does not contain LOG4J_PROPS" && exit 1)
docker run --rm "$dockerImage" grep -q LOG4J_PROPS /opt/alfresco-search/solr.in.cmd || (echo "solr.in.cmd does not contain LOG4J_PROPS" && exit 1)
docker run --rm "$dockerImage" [ -e /opt/alfresco-search/solrhome/conf/shared.properties ] || (echo "shared.properties does not exist" && exit 1)
docker run --rm "$dockerImage" /opt/alfresco-search/solr/bin/solr start
if [ "${nicebranch}" == "local" ]
then