From 51edfd31b64107b635a3423a48dbcf624916f1a9 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 31 Oct 2024 21:59:23 -0400 Subject: [PATCH] Changed wrapper location Installing `node_modules` in `/` fails made a directory named `/wrapper/` and moved files there to resolve. updated entrypoint to match new location. --- games/rust/Dockerfile | 8 ++++---- games/rust/entrypoint.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/games/rust/Dockerfile b/games/rust/Dockerfile index 3a11f02..540f444 100644 --- a/games/rust/Dockerfile +++ b/games/rust/Dockerfile @@ -6,8 +6,8 @@ RUN dpkg --add-architecture i386 \ && apt update \ && apt upgrade -y \ && apt install -y lib32gcc-s1 lib32stdc++6 unzip curl iproute2 tzdata libgdiplus libsdl2-2.0-0:i386 \ - && mkdir /node_modules \ - && npm install --prefix /node_modules ws \ + && mkdir /wrapper \ + && npm install --prefix /wrapper ws \ && useradd -d /home/container -m container USER container @@ -16,6 +16,6 @@ ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./entrypoint.sh /entrypoint.sh -COPY ./wrapper.js /wrapper.js +COPY ./wrapper.js /wrapper/wrapper.js -CMD [ "/bin/bash", "/entrypoint.sh" ] +CMD [ "/bin/bash", "/entrypoint.sh" ] \ No newline at end of file diff --git a/games/rust/entrypoint.sh b/games/rust/entrypoint.sh index e7c7dbf..03b51fb 100644 --- a/games/rust/entrypoint.sh +++ b/games/rust/entrypoint.sh @@ -45,4 +45,4 @@ fi export LD_LIBRARY_PATH=$(pwd)/RustDedicated_Data/Plugins/x86_64:$(pwd) # Run the Server -wrapper "${MODIFIED_STARTUP}" \ No newline at end of file +/wrapper/wrapper.js "${MODIFIED_STARTUP}" \ No newline at end of file