diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile index d96d454..eb645e7 100644 --- a/vanilla/Dockerfile +++ b/vanilla/Dockerfile @@ -21,15 +21,15 @@ RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ && update-ca-certificates -f; # Folder creation. -RUN mkdir -p /VSserver /VSserver/server /VSserver/data /VStemp /VStemp/files \ - && chmod 777 -R /VSserver /VStemp \ - && chown 99:100 -R /VSserver /VStemp +RUN mkdir -p /vs_server /vs_server/server /vs_server/data /vs_temp /vs_temp/files \ + && chmod 777 -R /vs_server /vs_temp \ + && chown 99:100 -R /vs_server /vs_temp -RUN wget --no-cache "$INSTALL_SCRIPT" -O /VStemp/install_script.sh \ - && chmod +x /VStemp/install_script.sh +RUN wget --no-cache "$INSTALL_SCRIPT" -O /vs_temp/install_script.sh \ + && chmod +x /vs_temp/install_script.sh # Directory where data is stored -VOLUME /VSserver +VOLUME /vs_server # Run command -CMD [ "/bin/bash", "./VStemp/install_script.sh" ] \ No newline at end of file +CMD [ "/bin/bash", "./vs_temp/install_script.sh" ] \ No newline at end of file diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index 3447ad5..1fa4221 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -6,7 +6,7 @@ VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/$VS_CHANNEL/vs_server_linux # Main install (Debian). # Check for server files and download if needed. -if [ -e /VSserver/server/server-$VS_VERSION.sh ] +if [ -e /vs_server/server/server-$VS_VERSION.sh ] then echo " " echo "INFO ! server-$VS_VERSION.sh found starting now." @@ -15,40 +15,40 @@ if [ -e /VSserver/server/server-$VS_VERSION.sh ] echo "WARNING ! server-$VS_VERSION.sh is out of date/missing ... will download now." echo " " echo "INFO ! Cleaning old files." - mkdir /VSserver/old-server-versions/ - mv /VSserver/server/* /VSserver/old-server-versions/server/ - if wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /VStemp/vs_server_linux-x64_$VS_VERSION.tar.gz + mkdir /vs_server/old-server-versions/ + mv /vs_server/server/* /vs_server/old-server-versions/server/ + if wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /vs_temp/vs_server_linux-x64_$VS_VERSION.tar.gz then echo "INFO ! server version $VS_VERSION download complete." fi - tar -xzf /VStemp/vs_server_linux-x64_$VS_VERSION.tar.gz -C /VStemp/files - rm -fr /VStemp/vs_server_linux-x64_*.*.*.tar.gz - cp -uR /VStemp/files/* /VSserver/server/ - rm -fr /VStemp/files/ - mv /VSserver/server/server.sh /VSserver/server/server-$VS_VERSION.sh + tar -xzf /vs_temp/vs_server_linux-x64_$VS_VERSION.tar.gz -C /vs_temp/files + rm -fr /vs_temp/vs_server_linux-x64_*.*.*.tar.gz + cp -uR /vs_temp/files/* /vs_server/server/ + rm -fr /vs_temp/files/ + mv /vs_server/server/server.sh /vs_server/server/server-$VS_VERSION.sh fi sleep 1 echo "INFO ! Setting server path." -sed '/VSPATH='/home/vintagestory/server'/c\VSPATH='/VSserver/server'' /VSserver/server/server-$VS_VERSION.sh +sed '/VSPATH='/home/vintagestory/server'/c\VSPATH='/vs_server/server'' /vs_server/server/server-$VS_VERSION.sh echo "INFO ! Setting data path." -sed '/DATAPATH='/var/vintagestory/data'/c\DATAPATH='/VSserver/data'' /VSserver/server/server-$VS_VERSION.sh +sed '/DATAPATH='/var/vintagestory/data'/c\DATAPATH='/vs_server/data'' /vs_server/server/server-$VS_VERSION.sh echo "INFO ! Setting username." -sed '/USERNAME='vintagestory'/c\USERNAME='$USERNAME'' /VSserver/server/server-$VS_VERSION.sh +sed '/USERNAME='vintagestory'/c\USERNAME='$USERNAME'' /vs_server/server/server-$VS_VERSION.sh sleep 1 # Set permissions. -chown 99:100 -R /VSserver -chmod 777 -R /VSserver -chmod +x /VSserver/server/server-$VS_VERSION.sh +chown 99:100 -R /vs_server +chmod 777 -R /vs_server +chmod +x /vs_server/server/server-$VS_VERSION.sh sleep 1 # Run vintage-story server. echo " " echo "INFO ! Starting vintage-story Server $VS_VERSION" -exec /VSserver/server/server-$VS_VERSION.sh +exec /vs_server/server/server-$VS_VERSION.sh exit \ No newline at end of file