From c236520c62976d80c2c4db08cc19c1168d8ef33c Mon Sep 17 00:00:00 2001 From: norimicry Date: Sun, 24 Jan 2021 02:25:32 +0100 Subject: [PATCH] =?UTF-8?q?minor=20cleanup=20and=20100%cpu=20bug=20fixed?= =?UTF-8?q?=20with=20strace.=20Yes,=20FUCKING,=20strace!=20because=20debug?= =?UTF-8?q?ging=20is=20obviously=20not=20possible=20in=20fucking=20schr?= =?UTF-8?q?=C3=B6dingers=20docker=20containers,=20the=20debugging=20will?= =?UTF-8?q?=20now=20be=20part=20of=20running=20this=20shit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 4 ++-- docker/Dockerfile | 6 ++---- docker/docker-entrypoint.sh | 11 ++++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0f23d91..971b842 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,8 @@ services: container_name: stardew environment: - "VNC_PASSWORD=nyanyanya" - - "DISPLAY_HEIGHT=1000" - - "DISPLAY_WIDTH=1400" + - "DISPLAY_HEIGHT=640" + - "DISPLAY_WIDTH=800" ## Always On Server mod # Removing this will probably defeat the point of ever using this? - ENABLE_ALWAYSONSERVER_MOD=${ENABLE_ALWAYSONSERVER_MOD-true} diff --git a/docker/Dockerfile b/docker/Dockerfile index d9fd38c..9e3b390 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,8 @@ ENV APP_NAME="StardewValley" RUN apt-get update #RUN apt-get install -y wget unzip xvfb x11vnc xterm i3 -RUN apt-get install -y wget unzip tar +RUN apt-get install -y wget unzip tar strace mono-complete xterm +RUN apt-get install -y gettext-base jq netcat procps # Game + ModLoader 1.5.4 3.8.3 RUN mkdir -p /data/Stardew && \ @@ -25,13 +26,10 @@ RUN mkdir -p /data/Stardew && \ tar xf /data/latest.tar.gz -C /data/Stardew && \ rm /data/latest.tar.gz -RUN apt-get install -y mono-complete - RUN wget https://github.com/Pathoschild/SMAPI/releases/download/3.9.0/SMAPI-3.9.0-installer.zip -qO /data/nexus.zip && \ unzip /data/nexus.zip -d /data/nexus/ && \ /bin/bash -c "echo -e \"2\n/data/Stardew/Stardew\ Valley\n1\n\" | /usr/bin/mono /data/nexus/SMAPI\ 3.9.0\ installer/internal/unix-install.exe" -RUN apt-get install -y gettext-base jq netcat procps # Add Mods diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 6862a4a..829567e 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -30,10 +30,11 @@ done /opt/tail-smapi-log.sh & -# Try fixing Backup Permissions -chmod -R 777 /data/Stardew/Stardew\ Valley/save-backups - # Ready to start! -/data/Stardew/Stardew\ Valley/StardewValley -sleep 233 +export XAUTHORITY=~/.Xauthority +TERM=xterm + +strace /data/Stardew/Stardew\ Valley/StardewValley + +sleep 233333333333333