ToxicMushroom/mare.server
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.server.git synced 2025-12-12 20:57:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix docker build

Browse source
This commit is contained in:
Caraxi 2025-08-22 18:32:45 +09:30
parent 51451a6160
commit 616b96981d
6 changed files with 222 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Docker/build/Dockerfile-MareSynchronosAuthService
View file

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD
FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD
COPY MareAPI /server/MareAPI
COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared
@ -12,7 +12,7 @@ RUN dotnet publish \
--output=/build \
MareSynchronosAuthService.csproj
FROM mcr.microsoft.com/dotnet/aspnet:8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0
RUN adduser \
--disabled-password \

4
Docker/build/Dockerfile-MareSynchronosServer
View file

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD
FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD
COPY MareAPI /server/MareAPI
COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared
@ -12,7 +12,7 @@ RUN dotnet publish \
--output=/build \
MareSynchronosServer.csproj
FROM mcr.microsoft.com/dotnet/aspnet:8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0
RUN adduser \
--disabled-password \

4
Docker/build/Dockerfile-MareSynchronosServices
View file

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD
FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD
COPY MareAPI /server/MareAPI
COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared
@ -12,7 +12,7 @@ RUN dotnet publish \
--output=/build \
MareSynchronosServices.csproj
FROM mcr.microsoft.com/dotnet/aspnet:8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0
RUN adduser \
--disabled-password \

4
Docker/build/Dockerfile-MareSynchronosStaticFilesServer
View file

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD
FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD
COPY MareAPI /server/MareAPI
COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared
@ -12,7 +12,7 @@ RUN dotnet publish \
--output=/build \
MareSynchronosStaticFilesServer.csproj
FROM mcr.microsoft.com/dotnet/aspnet:8.0
FROM mcr.microsoft.com/dotnet/aspnet:9.0
RUN adduser \
--disabled-password \

8
MareSynchronosServer/.idea/.idea.MareSynchronosServer/.idea/projectSettingsUpdater.xml generated Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="singleClickDiffPreview" value="1" />
<option name="unhandledExceptionsIgnoreList" value="1" />
<option name="vcsConfiguration" value="3" />
</component>
</project>

206
MareSynchronosServer/.idea/.idea.MareSynchronosServer/.idea/workspace.xml generated Normal file
View file

@ -0,0 +1,206 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoGeneratedRunConfigurationManager">
<projectFile profileName="IIS Express">MareSynchronosAuthService/MareSynchronosAuthService.csproj</projectFile>
<projectFile profileName="http">MareSynchronosAuthService/MareSynchronosAuthService.csproj</projectFile>
<projectFile profileName="MareSynchronosServer">MareSynchronosServer/MareSynchronosServer.csproj</projectFile>
<projectFile profileName="MareSynchronosServices">MareSynchronosServices/MareSynchronosServices.csproj</projectFile>
<projectFile profileName="IIS Express">MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj</projectFile>
<projectFile profileName="MareSynchronosStaticFilesServer">MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj</projectFile>
</component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="9b7ec607-1481-4600-b3aa-12eb70351a0f" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/../Docker/run/compose/mare-standalone.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../Docker/run/compose/mare-standalone.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../Docker/run/config/standalone/files-standalone.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Docker/run/config/standalone/files-standalone.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../Docker/run/config/standalone/server-standalone.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Docker/run/config/standalone/server-standalone.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../Docker/run/config/standalone/services-standalone.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Docker/run/config/standalone/services-standalone.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../Docker/run/windows-standalone.bat" beforeDir="false" afterPath="$PROJECT_DIR$/../Docker/run/windows-standalone.bat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosAuthService/Authentication/SecretKeyAuthReply.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/Authentication/SecretKeyAuthReply.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosAuthService/Authentication/SecretKeyFailedAuthorization.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/Authentication/SecretKeyFailedAuthorization.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosAuthService/Controllers/AuthControllerBase.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/Controllers/AuthControllerBase.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosAuthService/Controllers/JwtController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/Controllers/JwtController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosAuthService/Controllers/OAuthController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/Controllers/OAuthController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosAuthService/MareSynchronosAuthService.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosAuthService/MareSynchronosAuthService.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosAuthService/Services/GeoIPService.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosAuthService/Services/SecretKeyAuthenticatorService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/Services/SecretKeyAuthenticatorService.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosServer.sln" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer.sln" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosServer/Controllers/ClientMessageController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/Controllers/ClientMessageController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosServer/MareSynchronosServer.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/MareSynchronosServer.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosServer/Startup.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServer/Startup.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosServices/Discord/DiscordBot.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServices/Discord/DiscordBot.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosServices/Discord/MareWizardModule.AprilFools2024.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosServices/Discord/MareWizardModule.Register.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServices/Discord/MareWizardModule.Register.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MareSynchronosServices/Discord/MareWizardModule.cs" beforeDir="false" afterPath="$PROJECT_DIR$/MareSynchronosServices/Discord/MareWizardModule.cs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/24dd1164ba47541cb1d3eb011e638e16953dbea3ae3f4dc208c3bbf3e96298a/ServiceCollectionServiceExtensions.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/dbad425389ce87a11db1d22b2ab7f978e8e9ec4538bfcfbb79324d1545c0/InteractionService.cs" root0="SKIP_HIGHLIGHTING" />
</component>
<component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 4
}</component>
<component name="ProjectId" id="31cXlC3HLFVluOmvDSL3Cj2nVhH" />
<component name="ProjectViewState">
<option name="autoscrollFromSource" value="true" />
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"ModuleVcsDetector.initialDetectionPerformed": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "hm",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="RunManager" selected=".NET Launch Settings Profile.MareSynchronosAuthService: IIS Express">
<configuration name="MareSynchronosAuthService: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MareSynchronosAuthService/MareSynchronosAuthService.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0" />
<option name="LAUNCH_PROFILE_NAME" value="IIS Express" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
<option name="SEND_DEBUG_REQUEST" value="1" />
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
<option name="AUTO_ATTACH_CHILDREN" value="0" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="MareSynchronosAuthService: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MareSynchronosAuthService/MareSynchronosAuthService.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0" />
<option name="LAUNCH_PROFILE_NAME" value="http" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
<option name="SEND_DEBUG_REQUEST" value="1" />
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
<option name="AUTO_ATTACH_CHILDREN" value="0" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="MareSynchronosServer" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MareSynchronosServer/MareSynchronosServer.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0" />
<option name="LAUNCH_PROFILE_NAME" value="MareSynchronosServer" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
<option name="SEND_DEBUG_REQUEST" value="1" />
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
<option name="AUTO_ATTACH_CHILDREN" value="0" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="MareSynchronosServices" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MareSynchronosServices/MareSynchronosServices.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0" />
<option name="LAUNCH_PROFILE_NAME" value="MareSynchronosServices" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
<option name="SEND_DEBUG_REQUEST" value="1" />
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
<option name="AUTO_ATTACH_CHILDREN" value="0" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="MareSynchronosStaticFilesServer" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0" />
<option name="LAUNCH_PROFILE_NAME" value="MareSynchronosStaticFilesServer" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
<option name="SEND_DEBUG_REQUEST" value="1" />
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
<option name="AUTO_ATTACH_CHILDREN" value="0" />
<method v="2">
<option name="Build" />
</method>
</configuration>
<configuration name="MareSynchronosStaticFilesServer: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj" />
<option name="LAUNCH_PROFILE_TFM" value="net9.0" />
<option name="LAUNCH_PROFILE_NAME" value="IIS Express" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
<option name="SEND_DEBUG_REQUEST" value="1" />
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
<option name="AUTO_ATTACH_CHILDREN" value="0" />
<method v="2">
<option name="Build" />
</method>
</configuration>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="9b7ec607-1481-4600-b3aa-12eb70351a0f" name="Changes" comment="" />
<created>1755824482774</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1755824482774</updated>
<workItem from="1755824483992" duration="13745000" />
<workItem from="1755851713736" duration="760000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
<properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
<option name="timeStamp" value="1" />
</breakpoint>
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
<properties exception="System.Threading.Tasks.TaskCanceledException" breakIfHandledByOtherCode="false" displayValue="System.Threading.Tasks.TaskCanceledException" />
<option name="timeStamp" value="2" />
</breakpoint>
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
<properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
<option name="timeStamp" value="3" />
</breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>