Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,26 @@ WORKDIR /app
COPY ./Game.Engine/wwwroot ./

RUN ["npm", "i", "--unsafe-perm"]

RUN ["npm", "run", "build"]

FROM microsoft/dotnet:2.1-sdk
FROM mcr.microsoft.com/dotnet/sdk:5.0
WORKDIR /app
COPY . ./
COPY --from=0 /app/dist ./Game.Engine/wwwroot/dist

WORKDIR /app/Game.Engine
RUN ["dotnet", "publish", "-c", "Release"]
RUN dotnet publish -c Release -o out

WORKDIR /app/Game.Engine
RUN dotnet publish -c Release -o out

WORKDIR /app/Game.Util
RUN ["dotnet", "publish", "-c", "Release"]
RUN dotnet publish -c Release -o out

WORKDIR /app/Game.Registry
RUN ["dotnet", "publish", "-c", "Release"]
FROM mcr.microsoft.com/dotnet/aspnet:5.0
WORKDIR /app
COPY --from=1 /app/Game.Engine/out ./

WORKDIR /app/Game.Engine/bin/Release/netcoreapp2.1/publish
EXPOSE 5000
CMD ["dotnet", "Game.Engine.dll"]
EXPOSE 80
CMD ["dotnet", "Game.Engine.dll"]
4 changes: 2 additions & 2 deletions Game.API.Client/Game.API.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<LangVersion>7.1</LangVersion>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Game.API.Common\Game.API.Common.csproj" />
<ProjectReference Include="..\Game.Engine.Networking.FlatBuffers\Game.Engine.Networking.FlatBuffers.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Game.API.Common/Game.API.Common.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<LangVersion>7.1</LangVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
6 changes: 2 additions & 4 deletions Game.Engine.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2037
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game.Engine", "Game.Engine\Game.Engine.csproj", "{3AD01CCA-F212-4EE1-8718-2250D4869A53}"
EndProject
Expand All @@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game.Robots", "Game.Robots\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game.Registry", "Game.Registry\Game.Registry.csproj", "{BD231600-BDBE-48AE-89A8-366E22DF86D0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKISharp.SimplePKI", "PKISharp.SimplePKI\PKISharp.SimplePKI.csproj", "{6EFC6827-A34A-4908-B413-A0286DDB83E3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game.API.Client", "Game.API.Client\Game.API.Client.csproj", "{40BBE777-A59D-411F-BD61-34A2BB08D858}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game.API.Common", "Game.API.Common\Game.API.Common.csproj", "{0FC74086-5FDC-477E-93C2-927E11918AEE}"
Expand Down
10 changes: 1 addition & 9 deletions Game.Engine/ChatBot/DiscordBotModule.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
namespace Game.Engine.ChatBot
{
using Docker.DotNet;
using Discord;
using Discord.Commands;
using Discord.Rest;
Expand All @@ -9,8 +8,6 @@ namespace Game.Engine.ChatBot
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Docker.DotNet.Models;
using Game.Engine.Hosting;

// Modules must be public and inherit from an IModuleBase
public class DiscordBotModule : ModuleBase<SocketCommandContext>
Expand Down Expand Up @@ -51,12 +48,7 @@ public async Task ResetAsync()
public async Task DeployAsync(string url, string tag)
{
if (url == GameConfiguration.PublicURL || url == "*")
{
await DockerUpgrade.UpgradeAsync(GameConfiguration, tag, async (message) =>
{
await ReplyAsync(message);
});
}
await ReplyAsync("I'm sorry Dave, I can't do that.");
}


Expand Down
71 changes: 0 additions & 71 deletions Game.Engine/Common/DnsUtil.cs

This file was deleted.

91 changes: 0 additions & 91 deletions Game.Engine/Common/DohUtil.cs

This file was deleted.

36 changes: 0 additions & 36 deletions Game.Engine/Common/PKI/AccountKey.cs

This file was deleted.

Loading