diff --git a/Dockerfile b/Dockerfile index 683a864..133763c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,21 +19,22 @@ VOLUME [ "/root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/S # Expose Ports EXPOSE 9876/udp EXPOSE 9877/udp +EXPOSE 2169/tcp # Running as a bash script works, does not work otherwise -COPY ./init.sh / +COPY ./scripts/init.sh / RUN chmod +x /init.sh RUN bash /init.sh || : # Copy user configured settings -COPY ./config/ServerGameSettings.json /root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ -COPY ./config/ServerHostSettings.json /root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ -COPY ./config/adminlist.txt /root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ -COPY ./config/banlist.txt /root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ +# COPY ./config/ServerGameSettings.json /root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ +# COPY ./config/ServerHostSettings.json /root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ +# COPY ./config/adminlist.txt /root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ +# COPY ./config/banlist.txt /root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ # Start the program, check for update, backup configs, etc -COPY ./start.sh / -RUN chmod +x /start.sh +# COPY ./scripts/start.sh / +# RUN chmod +x /start.sh # Entry Point Script -CMD /start.sh \ No newline at end of file +# CMD /start.sh \ No newline at end of file diff --git a/config/ServerHostSettings.json b/config/ServerHostSettings.json index e8591be..81fc404 100644 --- a/config/ServerHostSettings.json +++ b/config/ServerHostSettings.json @@ -1,5 +1,5 @@ { - "Name": "Hangout Excuse", + "Name": "Total Hangout Excuse", "Description": "A great reason to hangout and what not", "Port": 9876, "QueryPort": 9877, diff --git a/init.sh b/scripts/init.sh similarity index 100% rename from init.sh rename to scripts/init.sh diff --git a/scripts/start.sh b/scripts/start.sh new file mode 100644 index 0000000..11e52f3 --- /dev/null +++ b/scripts/start.sh @@ -0,0 +1,10 @@ +HOST_FILE=/root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ServerHostSettings.json +GAME_FILE=/root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/ServerGameSettings.json +ADMIN_FILE=/root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/adminlist.txt +BAN_FILE=/root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/banlist.txt +if [ -f "$HOST_FILE" -a -f "$GAME_FILE" -a -f "$ADMIN_FILE" -a -f "$BAN_FILE"]; then + echo "Starting Server" + xvfb-run -a wine /root/.wine/drive_c/vrisingserver/VRisingServer.exe +else + echo "Copy over config files to the settings folder" +fi \ No newline at end of file diff --git a/start.sh b/start.sh deleted file mode 100644 index b1398f0..0000000 --- a/start.sh +++ /dev/null @@ -1,2 +0,0 @@ -# wine /root/.wine/drive_c/steamcmd/steamcmd.exe +force_install_dir "C:\VRisingServer" +login anonymous +app_update 1829350 +quit -xvfb-run -a wine /root/.wine/drive_c/vrisingserver/VRisingServer.exe \ No newline at end of file