diff --git a/README.md b/README.md index 8f98b30..383d8c3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# VpBridge +# VPLink -VpBridge is a simple bot for both Discord and Virtual Paradise which bridges chat messages from a designated Discord channel, to a world in Virtual Paradise. \ No newline at end of file +VPLink is a simple bot for both Discord and Virtual Paradise which bridges chat messages from a designated Discord channel, to a world in Virtual Paradise. \ No newline at end of file diff --git a/VpBridge.sln b/VPLink.sln similarity index 82% rename from VpBridge.sln rename to VPLink.sln index fddd12c..fd2e270 100644 --- a/VpBridge.sln +++ b/VPLink.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpBridge", "VpBridge\VpBridge.csproj", "{CD488A1E-0232-4EB5-A381-38A42B267B11}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VPLink", "VPLink\VPLink.csproj", "{CD488A1E-0232-4EB5-A381-38A42B267B11}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/VpBridge/Commands/WhoCommand.cs b/VPLink/Commands/WhoCommand.cs similarity index 98% rename from VpBridge/Commands/WhoCommand.cs rename to VPLink/Commands/WhoCommand.cs index e1c4d1d..2f23e63 100644 --- a/VpBridge/Commands/WhoCommand.cs +++ b/VPLink/Commands/WhoCommand.cs @@ -4,7 +4,7 @@ using Discord.Interactions; using VpSharp; using VpSharp.Entities; -namespace VpBridge.Commands; +namespace VPLink.Commands; /// /// Represents a class which implements the who command. diff --git a/VPLink/Dockerfile b/VPLink/Dockerfile new file mode 100644 index 0000000..f947853 --- /dev/null +++ b/VPLink/Dockerfile @@ -0,0 +1,20 @@ +FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base +WORKDIR /app +EXPOSE 80 +EXPOSE 443 + +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +WORKDIR /src +COPY ["VPLink/VPLink.csproj", "VpBridge/"] +RUN dotnet restore "VPLink/VPLink.csproj" +COPY . . +WORKDIR "/src/VpBridge" +RUN dotnet build "VPLink.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "VPLink.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "VPLink.dll"] diff --git a/VpBridge/Program.cs b/VPLink/Program.cs similarity index 98% rename from VpBridge/Program.cs rename to VPLink/Program.cs index b63efc9..2fc3c2e 100644 --- a/VpBridge/Program.cs +++ b/VPLink/Program.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Serilog; using Tomlyn.Extensions.Configuration; -using VpBridge.Services; +using VPLink.Services; using VpSharp; using X10D.Hosting.DependencyInjection; diff --git a/VpBridge/Services/DiscordService.cs b/VPLink/Services/DiscordService.cs similarity index 99% rename from VpBridge/Services/DiscordService.cs rename to VPLink/Services/DiscordService.cs index 52c8669..757a865 100644 --- a/VpBridge/Services/DiscordService.cs +++ b/VPLink/Services/DiscordService.cs @@ -8,11 +8,11 @@ using Discord.WebSocket; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using VpBridge.Commands; +using VPLink.Commands; using VpSharp; using VpSharp.Entities; -namespace VpBridge.Services; +namespace VPLink.Services; /// internal sealed partial class DiscordService : BackgroundService, IDiscordService diff --git a/VpBridge/Services/IDiscordService.cs b/VPLink/Services/IDiscordService.cs similarity index 96% rename from VpBridge/Services/IDiscordService.cs rename to VPLink/Services/IDiscordService.cs index 2531925..1683892 100644 --- a/VpBridge/Services/IDiscordService.cs +++ b/VPLink/Services/IDiscordService.cs @@ -1,7 +1,7 @@ using Discord; using VpSharp.Entities; -namespace VpBridge.Services; +namespace VPLink.Services; /// /// Represents a service that sends messages to the Discord channel. diff --git a/VpBridge/Services/IVirtualParadiseService.cs b/VPLink/Services/IVirtualParadiseService.cs similarity index 96% rename from VpBridge/Services/IVirtualParadiseService.cs rename to VPLink/Services/IVirtualParadiseService.cs index 5a01cf6..1668fd6 100644 --- a/VpBridge/Services/IVirtualParadiseService.cs +++ b/VPLink/Services/IVirtualParadiseService.cs @@ -1,7 +1,7 @@ using Discord; using VpSharp.Entities; -namespace VpBridge.Services; +namespace VPLink.Services; /// /// Represents a service that sends messages to the Virtual Paradise world server. diff --git a/VpBridge/Services/RelayService.cs b/VPLink/Services/RelayService.cs similarity index 98% rename from VpBridge/Services/RelayService.cs rename to VPLink/Services/RelayService.cs index 53ca06d..1c6c3b0 100644 --- a/VpBridge/Services/RelayService.cs +++ b/VPLink/Services/RelayService.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Logging; using VpSharp; using VpSharp.Extensions; -namespace VpBridge.Services; +namespace VPLink.Services; internal sealed class RelayService : BackgroundService { diff --git a/VpBridge/Services/VirtualParadiseService.cs b/VPLink/Services/VirtualParadiseService.cs similarity index 99% rename from VpBridge/Services/VirtualParadiseService.cs rename to VPLink/Services/VirtualParadiseService.cs index f9e6a11..53c1e1f 100644 --- a/VpBridge/Services/VirtualParadiseService.cs +++ b/VPLink/Services/VirtualParadiseService.cs @@ -8,7 +8,7 @@ using VpSharp; using VpSharp.Entities; using Color = System.Drawing.Color; -namespace VpBridge.Services; +namespace VPLink.Services; /// internal sealed class VirtualParadiseService : BackgroundService, IVirtualParadiseService diff --git a/VpBridge/VpBridge.csproj b/VPLink/VPLink.csproj similarity index 97% rename from VpBridge/VpBridge.csproj rename to VPLink/VPLink.csproj index a302290..4f4a5ac 100644 --- a/VpBridge/VpBridge.csproj +++ b/VPLink/VPLink.csproj @@ -52,7 +52,7 @@ - + diff --git a/VpBridge/Dockerfile b/VpBridge/Dockerfile deleted file mode 100644 index 511f9c0..0000000 --- a/VpBridge/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 443 - -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build -WORKDIR /src -COPY ["VpBridge/VpBridge.csproj", "VpBridge/"] -RUN dotnet restore "VpBridge/VpBridge.csproj" -COPY . . -WORKDIR "/src/VpBridge" -RUN dotnet build "VpBridge.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "VpBridge.csproj" -c Release -o /app/publish /p:UseAppHost=false - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "VpBridge.dll"] diff --git a/docker-compose.yml b/docker-compose.yml index 7633b19..cc0142c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,16 @@ version: '3.9' services: - vpbridge: - container_name: VpBridge + vplink: + container_name: VPLink pull_policy: build build: context: . - dockerfile: VpBridge/Dockerfile + dockerfile: VPLink/Dockerfile volumes: - type: bind - source: /var/log/vp/vp-bridge + source: /var/log/vp/vplink target: /app/logs - type: bind - source: /etc/vp/vp-bridge + source: /etc/vp/vplink target: /app/data restart: always