From 04e8086a2c6445c2b57b88ddf46b2c5b2dffe356 Mon Sep 17 00:00:00 2001 From: Carl Nelson Date: Fri, 3 Jun 2022 09:38:29 -0400 Subject: [PATCH 1/2] Remove '-slim' modifier from TSHOCK's mono version This patch should resolve https://github.com/ryansheehan/terraria/issues/73 per #73 & fpiesche: Tshock requires 'fsharp' which is not contained in -slim versions of mono. going forward slim versions of mono should not be used, so as to maintain mysql compatibility. If the ~100mb image savings are needed by a select few, suggest opening a ticket for interest and perhaps creating a tshock-slim version that forgoes complete compatibility for size; however a change to add fsharp to fix the known issue with slim should be introduced before the new image is released. --- tshock/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tshock/Dockerfile b/tshock/Dockerfile index 421b0cd..6a1aaf1 100644 --- a/tshock/Dockerfile +++ b/tshock/Dockerfile @@ -17,7 +17,8 @@ RUN unzip $TSHOCKZIP -d /tshock && \ # add executable perm to bootstrap chmod +x /tshock/bootstrap.sh -FROM mono:6.12.0.122-slim +# do not use -slim due to mysql/tshock requirements +FROM mono:6.12.0.122 LABEL maintainer="Ryan Sheehan " From 5fb8a49a908e0e102c25e088e790947c8fc066e5 Mon Sep 17 00:00:00 2001 From: Carl Nelson Date: Wed, 17 Aug 2022 15:20:20 -0400 Subject: [PATCH 2/2] Update Dockerfile New TSHOCK release --- tshock/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tshock/Dockerfile b/tshock/Dockerfile index 6a1aaf1..29b2215 100644 --- a/tshock/Dockerfile +++ b/tshock/Dockerfile @@ -6,8 +6,8 @@ RUN apk add --update-cache \ # add the bootstrap file COPY bootstrap.sh /tshock/bootstrap.sh -ENV TSHOCKVERSION=v4.5.17 -ENV TSHOCKZIP=TShock4.5.17_Terraria_1.4.3.6.zip +ENV TSHOCKVERSION=v4.5.18 +ENV TSHOCKZIP=TShock4.5.18_Terraria1.4.3.6.zip # Download and unpack TShock ADD https://github.com/Pryaxis/TShock/releases/download/$TSHOCKVERSION/$TSHOCKZIP /