Renaming misleading tomcat8 director to tomcat (version 9 used since LabKey19)

README.md

@@ -48,7 +48,7 @@ If old files and external modules are available, they should be either copied or
 - run `labkeyDocker/bin/installLabkey.sh 22.3` to unzip the enclosed LabKey binary code and make appropriate links.
 - copy `labkeyDocker/bin/env.sh.sample` to `labkeyDocker/bin/env.sh` and set a secret `$PGPASS`, other settings are probably OK, 
   check `$DOCKERCOMPOSE`
-- set the same value as `password` in `labkeyDocker/tomcat8/conf/Catalina/localhost/labkey.xml` 
+- set the same value as `password` in `labkeyDocker/tomcat/conf/Catalina/localhost/labkey.xml` 
 
 ### Permissions
 

bin/env.sh.sample

@@ -2,7 +2,7 @@ export NETWORK=labkey_network;
 export LBDOCKER=$HOME/labkeyDocker
 export POSTGRES_DIR=$LBDOCKER/postgresql/data;
 export LABKEY_DIR=$LBDOCKER/labkeyBase
-export TOMCAT_DIR=$LBDOCKER/tomcat8
+export TOMCAT_DIR=$LBDOCKER/tomcat
 export COMPOSE=$HOME/config/labkey-compose22.3.yaml
 #export COMPOSE=$HOME/config/labkey-compose19.yaml
 export DOCKERCOMPOSE=$HOME/.docker/cli-plugins/docker-compose

bin/installLabkey.sh

@@ -76,7 +76,7 @@ do
    fi;
 done;
 
-#tomcat-lib goes to tomcat8 user space in docker
+#tomcat-lib goes to tomcat user space in docker
 mv ${TMP_LABKEY}/tomcat-lib ${TOMCAT_DIR}/lib
 
 echo "Cleanup of tem directory";