diff --git a/server/Dockerfile b/server/Dockerfile index 4375323..d559d1a 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -19,15 +19,15 @@ RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ && update-ca-certificates -f; # Folder creation. -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 mkdir -p /vs_server /vs_server/server /vs_server/data /vstemp /vstemp/files \ + && chmod 777 -R /vs_server /vstemp \ + && chown 99:100 -R /vs_server /vstemp -RUN wget --no-cache "$INSTALL_SCRIPT" -O /vs_temp/install_script.sh \ - && chmod +x /vs_temp/install_script.sh +RUN wget --no-cache "$INSTALL_SCRIPT" -O /vstemp/install_script.sh \ + && chmod +x /vstemp/install_script.sh # Directory where data is stored VOLUME /vs_server # Run command -CMD [ "/bin/bash", "./vs_temp/install_script.sh" ] \ No newline at end of file +CMD [ "/bin/bash", "./vstemp/install_script.sh" ] \ No newline at end of file diff --git a/server/install_script.sh b/server/install_script.sh index 0c717ec..7e32968 100644 --- a/server/install_script.sh +++ b/server/install_script.sh @@ -34,10 +34,10 @@ if [ -e $VS_SERVER_DIR/server-$VS_VERSION.sh ] mkdir -pv $VS_SERVER_DIR/old-server-versions/ mv *.sh $VS_SERVER_DIR/old-server-versions/ rm -fr $VS_SERVER_DIR/assets $VS_SERVER_DIR/Lib $VS_SERVER_DIR/Mods $VS_SERVER_DIR/*.dll $VS_SERVER_DIR/*.pdb $VS_SERVER_DIR/*.json $VS_SERVER_DIR/*.xml $VS_SERVER_DIR/*.txt $VS_SERVER_DIR/VintagestoryServer - wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /vs_temp/vs_server_linux-x64_$VS_VERSION.tar.gz - tar -xzf /vs_temp/vs_server_linux-x64_$VS_VERSION.tar.gz -C /vs_temp/files - rm -fr /vs_temp/*.tar.gz - mv -uf /vs_temp/files/* $VS_SERVER_DIR/ + wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /vstemp/vs_server_linux-x64_$VS_VERSION.tar.gz + tar -xzf /vstemp/vs_server_linux-x64_$VS_VERSION.tar.gz -C /vstemp/files + rm -fr /vstemp/*.tar.gz + mv -uf /vstemp/files/* $VS_SERVER_DIR/ mv $VS_SERVER_DIR/server.sh $VS_SERVER_DIR/server-$VS_VERSION.sh chmod +x $VS_SERVER_DIR/server-$VS_VERSION.sh fi