From b68dc6e13c8907d9ff906c910c3e5124839ef399 Mon Sep 17 00:00:00 2001 From: LiamAEdwards Date: Sat, 21 Oct 2023 00:49:53 +0000 Subject: [PATCH] Switched to using watchdog --- Dockerfile | 6 +++--- start.sh | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a66271..1358f4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN wget https://github.com/space-wizards/SS14.Watchdog/archive/d0a68202284e837e cp -r SS14.Watchdog/bin/Release/net7.0/linux-x64/publish /ss14-default # Server stage -FROM mcr.microsoft.com/dotnet/runtime:7.0 AS server +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS server # Copy from the build stage COPY --from=build /ss14-default /ss14-default @@ -35,8 +35,8 @@ EXPOSE 5000/udp VOLUME [ "/ss14" ] # Add configurations -ADD appsettings.yml /ss14-default/appsettings.yml -ADD server_config.toml /ss14-default/server_config.toml +ADD appsettings.yml /ss14-default/publish/appsettings.yml +ADD server_config.toml /ss14-default/publish/server_config.toml COPY start.sh /start.sh RUN chmod +x /start.sh diff --git a/start.sh b/start.sh index 79071d5..57c0f36 100644 --- a/start.sh +++ b/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Check if directory is empty if [ ! "$(ls -A /ss14)" ]; then @@ -7,5 +7,6 @@ if [ ! "$(ls -A /ss14)" ]; then fi # Start the original command -exec /ss14/Robust.Server "$@" +cd ss14/publish/ +./SS14.Watchdog "$@"