diff --git a/Dockerfile b/Dockerfile index cc0dc6f..8049b5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM clearlinux:latest # Dependencies RUN swupd update -RUN swupd bundle-add x11-server libarchive wget wine go-basic +RUN swupd bundle-add x11-server libarchive wget wine # Directories RUN mkdir -p /root/.wine/drive_c/steamcmd @@ -19,30 +19,15 @@ 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 ./scripts/init.sh / RUN chmod +x /init.sh RUN bash /init.sh || : -RUN mkdir -p /src -WORKDIR /src -RUN git clone https://rodbiren.ddns.net/git/robviren/vrisingd -WORKDIR /src/vrisingd -RUN go build . -RUN cp ./vrisingd /vrisingd -WORKDIR / - -# 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/ - # Start the program, check for update, backup configs, etc -# COPY ./scripts/start.sh / -# RUN chmod +x /start.sh +COPY ./scripts/start.sh / +RUN chmod +x /start.sh # Entry Point Script -CMD /vrisingd \ No newline at end of file +CMD /start.sh \ No newline at end of file diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..5a18473 --- /dev/null +++ b/run.sh @@ -0,0 +1,7 @@ +#!/usr/bin/sh +mkdir settings +mkdir saves +chmod -R 777 settings +chmod -R 777 saves +cp config/* settings/ +docker run -dt -p 9876:9876/udp -p 9877:9877/udp -v "$(pwd)/saves":'/root/.wine/drive_c/users/root/AppData/LocalLow/Stunlock Studios/VRisingServer/Saves' -v "$(pwd)/settings":'/root/.wine/drive_c/vrisingserver/VRisingServer_Data/StreamingAssets/Settings/' --name rvrising rvrising \ No newline at end of file diff --git a/scripts/start.sh b/scripts/start.sh index 11e52f3..9002f2a 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,10 +1,2 @@ -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 +echo "Starting Server" +xvfb-run -a wine /root/.wine/drive_c/vrisingserver/VRisingServer.exe