mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-27 15:07:03 +01:00
Fix docker build
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
.dockerignore
|
||||
docker-compose.yml
|
||||
.git
|
||||
.gitignore
|
||||
.vs
|
||||
.vscode
|
||||
legacy
|
||||
*/bin
|
||||
*/obj
|
||||
+3
-3
@@ -7,11 +7,11 @@ COPY src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj src/
|
||||
COPY src/Tgstation.Server.Host/Tgstation.Server.Host.csproj src/Tgstation.Server.Host/
|
||||
COPY src/Tgstation.Server.Api/Tgstation.Server.Api.csproj src/Tgstation.Server.Api/
|
||||
|
||||
COPY tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj tests/Tgstation.Server.Api.Console.Tests/
|
||||
COPY tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj tests/Tgstation.Server.Host.Console.Tests/
|
||||
COPY tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj tests/Tgstation.Server.Api.Tests/
|
||||
COPY tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj tests/Tgstation.Server.Host.Tests/
|
||||
COPY tests/Tgstation.Server.Host.Console.Tests/Tgstation.Server.Host.Console.Tests.csproj tests/Tgstation.Server.Host.Console.Tests/
|
||||
|
||||
RUN dotnet restore -nowarn:msb3202,nu1503
|
||||
RUN dotnet restore -nowarn:MSB3202,nu1503 -p:RestoreUseSkipNonexistentTargets=false
|
||||
|
||||
COPY . .
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
*/.dockerignore
|
||||
*/docker-compose.yml
|
||||
*/docker-compose.*.yml
|
||||
.env
|
||||
.git
|
||||
.gitignore
|
||||
.vs
|
||||
.vscode
|
||||
legacy
|
||||
*/bin
|
||||
*/obj
|
||||
@@ -1 +0,0 @@
|
||||
version: '3'
|
||||
@@ -6,9 +6,6 @@
|
||||
<ProjectGuid>db2a5ee6-af5c-410c-a36c-ea378fe9cbfe</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Include="docker-compose.override.yml">
|
||||
<DependentUpon>docker-compose.yml</DependentUpon>
|
||||
</None>
|
||||
<None Include="docker-compose.yml" />
|
||||
<None Include=".dockerignore" />
|
||||
</ItemGroup>
|
||||
@@ -4,5 +4,5 @@ services:
|
||||
tgstation.server:
|
||||
image: tgstationserver
|
||||
build:
|
||||
context: ../..
|
||||
context: .
|
||||
dockerfile: build/Dockerfile
|
||||
@@ -10,8 +10,7 @@ namespace Tgstation.Server.CommandLine
|
||||
/// <summary>
|
||||
/// Entrypoint for the application
|
||||
/// </summary>
|
||||
/// <param name="args">The command line arguments for the application</param>
|
||||
/// <returns>A <see cref="Task"/> representing the running operation</returns>
|
||||
public static Task Main(string[] args) => Task.CompletedTask;
|
||||
public static Task Main() => Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,6 +20,9 @@ namespace Tgstation.Server.ControlPanel
|
||||
/// </summary>
|
||||
sealed partial class MainWindow : Window
|
||||
{
|
||||
/// <summary>
|
||||
/// Construct a <see cref="MainWindow"/>
|
||||
/// </summary>
|
||||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -11,6 +11,10 @@ namespace Tgstation.Server.Host.Console
|
||||
/// Entrypoint for the application
|
||||
/// </summary>
|
||||
/// <returns>A <see cref="Task"/> representing the running operation</returns>
|
||||
public static Task Main() => Task.CompletedTask;
|
||||
public static Task Main()
|
||||
{
|
||||
System.Console.WriteLine("Hello world!");
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
/// <summary>
|
||||
/// Entrypoint for the application
|
||||
/// </summary>
|
||||
/// <returns>A <see cref="Task"/> representing the running operation</returns>
|
||||
static void Main()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6-3E2C-46D4-872D-D528F77D6973}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
build\BuildDox.ps1 = build\BuildDox.ps1
|
||||
build\Dockerfile = build\Dockerfile
|
||||
build\Doxyfile = build\Doxyfile
|
||||
build\tgs.ico = build\tgs.ico
|
||||
build\UploadCoverage.ps1 = build\UploadCoverage.ps1
|
||||
@@ -49,7 +50,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.CommandLin
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Host.Tests", "tests\Tgstation.Server.Host.Tests\Tgstation.Server.Host.Tests.csproj", "{A3362FF6-550F-480F-859E-8EC1EB6EAB31}"
|
||||
EndProject
|
||||
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "build\docker-compose\docker-compose.dcproj", "{DB2A5EE6-AF5C-410C-A36C-EA378FE9CBFE}"
|
||||
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{DB2A5EE6-AF5C-410C-A36C-EA378FE9CBFE}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
||||
Reference in New Issue
Block a user