mirror of
https://github.com/Misterblue/opensim-docker.git
synced 2026-07-30 19:32:56 +00:00
Rework and simplify configuration.
Add NCG build (image-ncg)
This commit is contained in:
@@ -13,29 +13,6 @@ export VERSIONDIR=$OPENSIMHOME/VERSION
|
||||
export OPENSIMBIN=$OPENSIMHOME/opensim/bin
|
||||
export OPENSIMCONFIG=$OPENSIMBIN/config
|
||||
|
||||
FIRSTTIMEFLAG=$OPENSIMHOME/.firstTimeFlag
|
||||
|
||||
# Some setup environment variables should have been set
|
||||
for requiredEnv in "EXTERNAL_HOSTNAME" ; do
|
||||
if [[ -z "${!requiredEnv}" ]] ; then
|
||||
echo "Environment variable $requiredEnv is not set"
|
||||
exit 5
|
||||
fi
|
||||
done
|
||||
|
||||
# If this configuration has stuff to do...
|
||||
if [[ -e "$OPENSIMCONFIG/setup.sh" ]] ; then
|
||||
$OPENSIMCONFIG/setup.sh
|
||||
fi
|
||||
|
||||
if [[ ! -e "$FIRSTTIMEFLAG" ]] ; then
|
||||
# First time setup for the OpenSim running and crash checking scripts
|
||||
cd "$OPENSIMHOME"
|
||||
./firstTimeSetup.sh
|
||||
touch "$FIRSTTIMEFLAG"
|
||||
rm -f NOOPENSIM
|
||||
fi
|
||||
|
||||
# Start Opensim
|
||||
echo "Starting OpenSimulator version $(cat $VERSIONDIR/OS_VERSION)"
|
||||
echo " with opensim-docker version $(cat $VERSIONDIR/OS_DOCKER_IMAGE_VERSION)"
|
||||
@@ -43,6 +20,8 @@ echo " using configuration set \"$CONFIG_NAME\""
|
||||
|
||||
cd "$OPENSIMHOME"
|
||||
./run.opensim.sh
|
||||
|
||||
# Wait around here because when this script exits the Docker container exits
|
||||
while true ; do
|
||||
sleep 300
|
||||
./checkOpenSim.sh
|
||||
|
||||
Reference in New Issue
Block a user