Merge branch 'VIVO-3034-psuedo-rebase' of https://github.com/vivo-pro…

…ject/VIVO into VIVO-3786-3822-docker-updates

docker-compose.yml

@@ -42,3 +42,10 @@ services:
       - solr
     networks:
       - net
+    entrypoint:
+      - /bin/bash
+      - '-c'
+      - |
+        while (!</dev/tcp/solr/8983) > /dev/null 2>&1; do sleep 1; done;
+        sleep 5
+        /start.sh

installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties

@@ -24,7 +24,7 @@
 # debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
 
 log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}.all.log
+log4j.appender.AllAppender.File=${catalina.base}/logs/${app-name}.all.log
 log4j.appender.AllAppender.MaxFileSize=10MB
 log4j.appender.AllAppender.MaxBackupIndex=10
 log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout

start.sh

@@ -101,8 +101,4 @@ cp -r /tmp/vivo.war /usr/local/tomcat/webapps/$TOMCAT_CONTEXT_PATH.war
 
 export JAVA_OPTS="${JAVA_OPTS} -Dvivo-dir=$VIVO_HOME_DIR -Droot-user-address=$ROOT_USER_ADDRESS -Ddefault-namespace=$DEFAULT_NAMESPACE -Dtdb:fileMode=$TDB_FILE_MODE"
 
-echo "Giving time for Solr to startup..."
-sleep 15
-echo "Starting Tomcat"
-
 catalina.sh run