Reverting Cloud docker changes

Author: glenrobson

docker/sas-solr-cloud/Dockerfile

@@ -9,12 +9,15 @@ RUN mvn $MVN_ARGS package
 # runnable container stage
 FROM tomcat:9-jre11 AS runstage
 # remove tomcat default webapps and create data directory
-RUN rm -r /usr/local/tomcat/webapps/* && \
-  mkdir /annotation-data
+RUN rm -r /usr/local/tomcat/webapps/*
 # copy SAS from build image
 COPY --from=buildstage /usr/src/sas/target/simpleAnnotationStore /usr/local/tomcat/webapps/ROOT
-COPY --from=buildstage /usr/src/sas /usr/src/sas
 # copy properties
 COPY docker/sas-solr-cloud/sas.properties /usr/local/tomcat/webapps/ROOT/WEB-INF
 
+# Used for testing:
+COPY . /usr/src/sas
+RUN apt-get update && apt-get -y install maven
+COPY docker/sas-solr-cloud/sas.properties /usr/src/sas/src/test/resources/test.properties
+
 # use default port and entrypoint

docker/sas-solr/Dockerfile

@@ -9,8 +9,7 @@ RUN mvn $MVN_ARGS package
 # runnable container stage
 FROM tomcat:9-jre11 AS runstage
 # remove tomcat default webapps and create data directory
-RUN rm -r /usr/local/tomcat/webapps/* && \
-  mkdir /annotation-data
+RUN rm -r /usr/local/tomcat/webapps/*
 # copy SAS from build image
 COPY --from=buildstage /usr/src/sas/target/simpleAnnotationStore /usr/local/tomcat/webapps/ROOT
 # copy properties

travis/integration_tests.sh

@@ -52,8 +52,6 @@ do
     running=`docker ps --filter "name=create-collection" |wc -l`
 done
 docker exec -t solr1 /opt/docker-solr/scripts/wait-for-solr.sh --max-attempts 10 --wait-seconds 5 --solr-url http://0.0.0.0:8983/
-docker ps
-docker logs simpleannotationserver_web_1
 # Due to the way docker-compose and SOLR works we can't access the SOLR cloud
 # from this machine. Instead we have to run the test within the cluster
 docker exec --workdir /usr/src/sas simpleannotationserver_web_1 /usr/bin/mvn test