From 474d5bd2adc237fbfd28e13d480d2158df381762 Mon Sep 17 00:00:00 2001 From: Radical Date: Fri, 14 Jun 2024 19:10:46 +0000 Subject: [PATCH 1/6] Switch to 7z, remove useless deps --- .gitignore | 3 --- Dockerfile | 16 ++++------------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 9974cba..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +0,0 @@ -flowstate-scripts.zip -flowstate.zip -server.zip \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index a2cf7bc..5a29708 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN useradd -m r5reloaded RUN dpkg --add-architecture i386 && \ apt update -y && \ apt upgrade -y && \ - apt install software-properties-common wget unzip gnupg -y && \ + apt install software-properties-common wget p7zip gnupg -y && \ wget -qO - https://dl.winehq.org/wine-builds/winehq.key | apt-key add - && \ apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main' && \ apt update -y && \ @@ -19,11 +19,7 @@ RUN dpkg --add-architecture i386 && \ # Copy # Server zip downloaded from announcements -COPY server.zip /home/r5reloaded -# https://github.com/ColombianGuy/r5_flowstate/archive/refs/heads/r5_flowstate.zip renamed to flowstate-scripts.zip -ADD https://github.com/ColombianGuy/r5_flowstate/archive/refs/heads/r5_flowstate.zip /home/r5reloaded/flowstate-scripts.zip -# https://github.com/ColombianGuy/r5_flowstate/releases/latest Flowstate.-.Required.Files.zip renamed to flowstate.zip -ADD https://github.com/ColombianGuy/r5_flowstate/releases/latest/download/FS4.1.-.Required.Files.zip /home/r5reloaded/flowstate.zip +COPY server.7z /home/r5reloaded RUN chown -R r5reloaded:r5reloaded /home/r5reloaded # Swap to new user @@ -34,16 +30,12 @@ USER r5reloaded RUN mkdir /home/r5reloaded/server WORKDIR /home/r5reloaded/server -RUN unzip -o ../server.zip -RUN unzip -o ../flowstate-scripts.zip && \ - cp -r r5_flowstate-r5_flowstate/* platform/scripts -WORKDIR /home/r5reloaded/server -RUN unzip -o ../flowstate.zip +RUN 7z x ../server.7z # Delete files USER root -RUN rm -rf /home/r5reloaded/server.zip /home/r5reloaded/flowstate.zip /home/r5reloaded/flowstate-scripts.zip +RUN rm -rf /home/r5reloaded/server.7z # Remove apt packages From ff73cd79facba1c1bb2e5d41e0eab5b72d3d9e71 Mon Sep 17 00:00:00 2001 From: Radical Date: Fri, 21 Jun 2024 11:13:16 +0000 Subject: [PATCH 2/6] Update readme to reflect changes --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3f69d7c..4e9d870 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,14 @@ This runs R5Reloaded from a docker container, this makes setting up servers a bi ### Install 1. Clone this directory `git clone https://github.com/Radiicall/r5reloaded-docker.git` -2. Grab a server zip file from the #announcements channel in the R5Reloaded server -3. Place server[.]zip in the cloned directory -4. Rename the server zip to `server.zip` +2. Grab a server 7z file from the R5Reloaded Discord Server +3. Place server[.]7z in the cloned directory +4. Rename the server 7z to `server.7z` 5. Run `docker build -t r5reloaded-server -f Dockerfile` while still in the cloned directory ### Configuration -Inside the docker-compose file you'll see the environment variables, these can be changed to configure the server +Inside the `docker-compose.yml` file you'll see the environment variables, these can be changed to configure the server ### Running From d0392cbc799aefbda915b359435563deb730a3b6 Mon Sep 17 00:00:00 2001 From: hax4dazy Date: Sun, 10 Nov 2024 00:24:17 +0100 Subject: [PATCH 3/6] Install Wine 8.02 instead of 9 Wine 9 breaks the R5Realoded server files. Wine 8 doesn't do this. Here's a link to my "findings" with wine 9. https://discord.com/channels/873158454850756638/959168332286791750/1304899663047954434 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5a29708..f8893d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN dpkg --add-architecture i386 && \ wget -qO - https://dl.winehq.org/wine-builds/winehq.key | apt-key add - && \ apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main' && \ apt update -y && \ - apt install winehq-stable -y + apt install winehq-stable=8.0.2~jammy-1 wine-stable=8.0.2~jammy-1 wine-stable-amd64=8.0.2~jammy-1 wine-stable-i386=8.0.2~jammy-1 -y # Copy From df250b895f77dabcdc6d447276370ff0c7d2be42 Mon Sep 17 00:00:00 2001 From: Radical Date: Fri, 15 Nov 2024 19:47:09 +0100 Subject: [PATCH 4/6] Use correct ubuntu for wine repo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f8893d4..4c20044 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM ubuntu:jammy LABEL org.opencontainers.image.authors="radical@radical.fun" version="1.1" # Add new user From d1220fa8b5c1ad2f57fa173e01da8fc6485dea38 Mon Sep 17 00:00:00 2001 From: Radical Date: Sat, 16 Nov 2024 00:50:11 +0100 Subject: [PATCH 5/6] Allow customizing internal port binds Untested, this is needed for public servers --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4c20044..1e076f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,6 +58,7 @@ ENV DEBIAN_FRONTEND=noninteractive ENV WINEARCH=win64 ENV WINEPREFIX=/home/r5reloaded/server/wineprefix ENV HOME=/home/r5reloaded +ENV PORT=37000 -ENTRYPOINT wine r5apex_ds.exe -port 37000 +launchplaylist "${PLAYLIST}" +hostname "${NAME}" ${ARGS} +ENTRYPOINT wine r5apex_ds.exe -port ${PORT} +launchplaylist "${PLAYLIST}" +hostname "${NAME}" ${ARGS} From 9eca38c979324cdc88baeac6dfcc127196e09bbe Mon Sep 17 00:00:00 2001 From: Radical Date: Sat, 16 Nov 2024 01:16:41 +0100 Subject: [PATCH 6/6] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1e076f9..88b2d8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN dpkg --add-architecture i386 && \ # Copy # Server zip downloaded from announcements -COPY server.7z /home/r5reloaded +ADD https://s3.r5reloaded.com/dedicated_builds/server_v2.5_r3_46e2424b.7z /home/r5reloaded/server.7z RUN chown -R r5reloaded:r5reloaded /home/r5reloaded # Swap to new user