Updating paths and fixing ip range for labkey_network

bin/env.sh.sample

@@ -3,10 +3,12 @@ export LBDOCKER=$HOME/labkeyDocker
 export POSTGRES_DIR=$LBDOCKER/postgresql/data;
 export LABKEY_DIR=$LBDOCKER/labkeyBase
 export TOMCAT_DIR=$LBDOCKER/tomcat
-export COMPOSE=$HOME/config/labkey-compose22.3.yaml
+export COMPOSE=$LBDOCKER/config/labkey-compose22.3.yaml
 #export COMPOSE=$HOME/config/labkey-compose19.yaml
 export DOCKERCOMPOSE=$HOME/.docker/cli-plugins/docker-compose
 export PGPASS=somethingSecret
+export LABKEY_FILES=$HOME/files
+export EXTERNAL_MODULES=$HOME/externalModules
 #other variables
 export USER_ID=$(id -u labkey)
 export GROUP_ID=$(id -g labkey)

bin/installLabkey.sh

@@ -36,7 +36,7 @@ fi;
 echo "Using $LABKEY";
 
 #full path to source
-SFW_SRC=$LBDOCKER/packages/$LABKEY.tar.gz
+SFW_SRC=$HOME/packages/$LABKEY.tar.gz
 
 #this is temp only
 TMP_DIR=$HOME/tmp

bin/startLabkey.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 . $(dirname $0)/env.sh
-docker network create -d bridge $NETWORK
+docker network create -d bridge --subnet=172.18.1.0/24 --ip-range=172.18.1.0/24 $NETWORK 
 $DOCKERCOMPOSE -f $COMPOSE up -d;