Project Re-Structure

Project Re-Structure

Databases/MSSQL/Dockerfile → src/.docker/mssql/Dockerfile

@@ -4,7 +4,9 @@ RUN mkdir -p /user/config
 
 WORKDIR /user/config
 
-COPY /Databases/MSSQL/. /user/config
+COPY ./.docker/mssql/entrypoint.sh /user/config
+COPY ./.docker/mssql/initialization.sh /user/config
+COPY ./.docker/mssql/setup.sql /user/config
 
 RUN chmod +x /user/config/initialization.sh
 

src/.docker/mssql/setup.sql

@@ -0,0 +1,13 @@
+USE master
+GO
+
+IF DB_ID('OpenWorldServer') IS NULL
+BEGIN
+    RESTORE DATABASE OpenWorldServer
+    FROM DISK =  N'/var/opt/mssql/backups/OpenWorldServerEmpty.bak' WITH REPLACE,
+        MOVE N'OpenWorldServer' TO N'/var/opt/mssql/data/OpenWorldServer.mdf',
+        MOVE N'OpenWorldServer_log' TO  N'/var/opt/mssql/data/OpenWorldServer_log.ldf',
+    NOUNLOAD,
+    STATS = 5;
+END
+GO

src/.env

@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=OWS2

OWS.sln → src/OWS.sln

@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWSData", "OWSData\OWSData.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWSShared", "OWSShared\OWSShared.csproj", "{1079DBF9-68A4-4BA0-9DA3-70F0FFC99D7D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWSExternalLoginProviders", "OWSExternalLoginProviders\OWSExternalLoginProviders.csproj", "{053DDD68-19A8-44FC-B7B7-99F045C8566A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWSInstanceManagement", "OWSInstanceManagement\OWSInstanceManagement.csproj", "{D35E29BD-65C6-466D-B28E-1E1CA774E92C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWSCharacterPersistence", "OWSCharacterPersistence\OWSCharacterPersistence.csproj", "{780EECD0-DE51-4C1C-AF52-756C6251079B}"
@@ -29,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{B9D5E83C-2A78-4CFB-B10F-4E7975CD1183}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OWSExternalLoginProviders", "OWSExternalLoginProviders\OWSExternalLoginProviders.csproj", "{91B38571-93C8-43B9-82B4-FC40F35D0B0B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,10 +51,6 @@ Global
 		{1079DBF9-68A4-4BA0-9DA3-70F0FFC99D7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1079DBF9-68A4-4BA0-9DA3-70F0FFC99D7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1079DBF9-68A4-4BA0-9DA3-70F0FFC99D7D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{053DDD68-19A8-44FC-B7B7-99F045C8566A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{053DDD68-19A8-44FC-B7B7-99F045C8566A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{053DDD68-19A8-44FC-B7B7-99F045C8566A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{053DDD68-19A8-44FC-B7B7-99F045C8566A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D35E29BD-65C6-466D-B28E-1E1CA774E92C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D35E29BD-65C6-466D-B28E-1E1CA774E92C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D35E29BD-65C6-466D-B28E-1E1CA774E92C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -71,6 +67,10 @@ Global
 		{B9D5E83C-2A78-4CFB-B10F-4E7975CD1183}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9D5E83C-2A78-4CFB-B10F-4E7975CD1183}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9D5E83C-2A78-4CFB-B10F-4E7975CD1183}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91B38571-93C8-43B9-82B4-FC40F35D0B0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91B38571-93C8-43B9-82B4-FC40F35D0B0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91B38571-93C8-43B9-82B4-FC40F35D0B0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91B38571-93C8-43B9-82B4-FC40F35D0B0B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

OWSData/OWSData.csproj → src/OWSData/OWSData.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+	  <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

OWSExternalLoginProviders/OWSExternalLoginProviders.csproj → src/OWSExternalLoginProviders/OWSExternalLoginProviders.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

OWSInstanceLauncher/Properties/launchSettings.json → src/OWSInstanceLauncher/Properties/launchSettings.json

@@ -1,10 +1,10 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:55517",
-      "sslPort": 44379
+      "applicationUrl": "http://localhost:52758/",
+      "sslPort": 44306
     }
   },
   "profiles": {
@@ -18,10 +18,10 @@
     "OWSInstanceLauncher": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
     }
   }
-}
+}

OWSInstanceLauncher/appsettings.json → src/OWSInstanceLauncher/appsettings.json

@@ -7,25 +7,21 @@
     }
   },
   "AllowedHosts": "*",
-  "OWSInstanceLauncherOptions": {
-    "OWSAPIKey": "",
-    "PathToDedicatedServer": "C:\\Program Files\\Epic Games\\UE_4.26\\Engine\\Binaries\\Win64\\UE4Editor.exe",
+  "RabbitMQOptions": {
+    "RabbitMQHostName": "host.docker.internal",
+    "RabbitMQPort": 5672,
     "RabbitMQUserName": "dev",
-    "RabbitMQPassword": "test",
-    "ServerArguments": "\"C:\\OWS\\OpenWorldStarterPlugin\\OpenWorldStarter.uproject\" {0}?listen -server -log -nosteam -messaging -port={1}",
+    "RabbitMQPassword": "test"
+  },
+  "OWSInstanceLauncherOptions": {
+    "OWSAPIKey": "22BBB32C-C18F-426C-8599-E3FE5863BD07",
+    "PathToDedicatedServer": "D:\\Games\\UE_4.26\\Engine\\Binaries\\Win64\\UE4Editor.exe",
+    "ServerArguments": "\"E:\\OWSTesting\\OpenWorldStarterPlugin\\OpenWorldStarter.uproject\" {0}?listen -server -log -nosteam -messaging -port={1}",
     "RunServerHealthMonitoringFrequencyInSeconds": 30
   },
   "OWSAPIPathConfig": {
-    "InternalRabbitMQServerHostName": "localhost",
     "InternalPublicApiURL": "https://localhost:44303/",
     "InternalInstanceManagementApiURL": "https://localhost:44329/",
     "InternalCharacterPersistenceApiURL": "https://localhost:44324/"
-  },
-  "Kestrel": {
-    "Endpoints": {
-      "Http": {
-        "Url": "http://localhost:8181"
-      }
-    }
   }
-}
+}

OWSShared/OWSShared.csproj → src/OWSShared/OWSShared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

docker-compose.dcproj → src/docker-compose.dcproj

@@ -4,15 +4,14 @@
     <ProjectVersion>2.1</ProjectVersion>
     <DockerTargetOS>Linux</DockerTargetOS>
     <ProjectGuid>b9d5e83c-2a78-4cfb-b10f-4e7975cd1183</ProjectGuid>
-    <DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
-    <DockerServiceUrl>{Scheme}://localhost:{ServicePort}/api/values</DockerServiceUrl>
-    <DockerServiceName>owspublicapi</DockerServiceName>
+    <DockerLaunchAction>None</DockerLaunchAction>
+    <DockerServiceName>OWS</DockerServiceName>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="docker-compose.override.yml">
+  <None Include="docker-compose.override.yml">
       <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
-    <None Include="docker-compose.yml" />
-    <None Include=".dockerignore" />
+  </None>
+  <None Include="docker-compose.yml" />
+  <None Include=".dockerignore" />
   </ItemGroup>
 </Project>

docker-compose.yml → src/docker-compose.yml

@@ -5,7 +5,7 @@ services:
   mssql:
     build:
       context: .
-      dockerfile: Databases/MSSQL/Dockerfile
+      dockerfile: .docker/mssql/Dockerfile
     environment:
      - ACCEPT_EULA=Y
      # Developer, Express, Standard, Enterprise, EnterpriseCore
@@ -18,7 +18,7 @@ services:
      - mssql_log:/var/opt/mssql/log
      - mssql_secrets:/var/opt/mssql/secrets
      - type: bind
-       source: ./Databases/MSSQL/backups
+       source: .docker/mssql/backups
        target: /var/opt/mssql/backups
 
   rabbitmq:
@@ -27,7 +27,7 @@ services:
       - "5672:5672"
       - "15672:15672"
     volumes:
-    - ./rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
+    - .docker/rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
 
   owspublicapi:
     image: ${REGISTRY:-ows}/owspublicapi:${PLATFORM:-linux}-${TAG:-latest}