From 9d8a6bbfbf61fa26f97483b45f93f38f4021ee53 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Tue, 24 Jul 2018 12:00:27 -0400 Subject: [PATCH] Add docker tgs.sh. Fix docker not copying appsettings jsons --- build/Dockerfile | 4 ++-- build/tgs.docker.sh | 5 +++++ src/Tgstation.Server.Host.Console/tgs.sh | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100755 build/tgs.docker.sh diff --git a/build/Dockerfile b/build/Dockerfile index dd8d097837..e4d8f487e7 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -33,7 +33,6 @@ RUN dotnet test -c Release WORKDIR /src/tests/Tgstation.Server.Host.Console.Tests RUN dotnet test -c Release -FROM build AS publish RUN dotnet publish -c Release -o /app FROM microsoft/dotnet:2.0-runtime @@ -41,7 +40,8 @@ EXPOSE 80 WORKDIR /app -COPY --from=publish /app . +COPY --from=build /app . +COPY --from=build /src/build/tgs.docker.sh tgs.sh RUN mkdir /config_data && mv appsettings.Docker.json /config_data/appsettings.Production.json VOLUME ["/config_data"] diff --git a/build/tgs.docker.sh b/build/tgs.docker.sh new file mode 100755 index 0000000000..ac9a5d2151 --- /dev/null +++ b/build/tgs.docker.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +cp -r /config_data/* ./ + +exec dotnet Tgstation.Server.Host.Console.dll diff --git a/src/Tgstation.Server.Host.Console/tgs.sh b/src/Tgstation.Server.Host.Console/tgs.sh index 1f50a92ca5..895becc72e 100755 --- a/src/Tgstation.Server.Host.Console/tgs.sh +++ b/src/Tgstation.Server.Host.Console/tgs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh script_full_path=$(dirname "$0") exec dotnet "$script_full_path/Tgstation.Server.Host.Console.dll"