cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 07:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Docker fixups

Browse Source
This commit is contained in:
Cyberboss
2018-07-25 12:20:44 -04:00
parent 830471f4b7
commit fb8b1478b9
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.dockerignore
-3
View File
@@ -1,11 +1,8 @@
.dockerignore
docker-compose.yml
.git
.gitignore
.vs
.vscode
legacy
packages
build
*/bin
*/obj
build/Dockerfile
+6 -2
View File
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.0-sdk AS build
FROM microsoft/dotnet:2.1-sdk AS build
WORKDIR /src
COPY tgstation-server.sln ./
@@ -33,9 +33,13 @@ RUN dotnet test -c Release
WORKDIR /src/tests/Tgstation.Server.Host.Console.Tests
RUN dotnet test -c Release
WORKDIR /src/src/Tgstation.Server.Host.Console
RUN dotnet publish -c Release -o /app
FROM microsoft/dotnet:2.0-runtime
WORKDIR /src/src/Tgstation.Server.Host
RUN dotnet publish -c Release -o /app/lib/Default && mv /app/lib/Default/appsettings* /app
FROM microsoft/dotnet:2.1-aspnetcore-runtime
EXPOSE 80
WORKDIR /app
tgstation-server.sln
+2 -1
View File
@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DA32568D-1D8D-4A4C-9943-BFD3CE796B3F}"
ProjectSection(SolutionItems) = preProject
.codecov.yml = .codecov.yml
.dockerignore = .dockerignore
.gitignore = .gitignore
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
@@ -102,7 +103,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v4", "v4", "{057FAC33-CC31-
src\DMAPI\tgs\v4\commands.dm = src\DMAPI\tgs\v4\commands.dm
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tgstation.Server.Host.Console.Debug", "src\Tgstation.Server.Host.Console.Debug\Tgstation.Server.Host.Console.Debug.csproj", "{15BE5763-DA6F-433F-A4C2-9FCF85F5CC21}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Host.Console.Debug", "src\Tgstation.Server.Host.Console.Debug\Tgstation.Server.Host.Console.Debug.csproj", "{15BE5763-DA6F-433F-A4C2-9FCF85F5CC21}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution