Add New Docker Compose File

.gitignore

@@ -13,3 +13,6 @@ src/Properties
 __pycache__/
 /src/Dlls/SmartFox2X.dll
 /src/appsettings.Development.json
+/launchSettings.json
+/obj/Docker
+/docker-compose.override.yml

docker-compose.dcproj

@@ -3,6 +3,10 @@
   <PropertyGroup Label="Globals">
     <ProjectVersion>2.1</ProjectVersion>
     <DockerTargetOS>Linux</DockerTargetOS>
+    <ProjectGuid>81dded9d-158b-e303-5f62-77a2896d2a5a</ProjectGuid>
+    <DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
+    <DockerServiceUrl>{Scheme}://localhost:{ServicePort}</DockerServiceUrl>
+    <DockerServiceName>sodoff</DockerServiceName>
   </PropertyGroup>
   <ItemGroup>
     <None Include="docker-compose.override.yml">
@@ -11,4 +15,4 @@
     <None Include="docker-compose.yml" />
     <None Include=".dockerignore" />
   </ItemGroup>
-</Project>
+</Project>

docker-compose.yml

@@ -1,25 +1,32 @@
-version: '3.8'
 services:
   sodoff:
+    container_name: sodoff-jsgr
+    image: ${DOCKER_REGISTRY-}sodoff
     build:
       context: .
       dockerfile: src/Dockerfile
-    # ports:
-    #   - 5000:5000
+    ports:
+      - 5040:5000
     networks:
-      sodoff_network:
-        # use static ip address for nginx proxy configuration
-        #  - if run multiple instances of this docker, each instance should use unique address
-        #  - if do not use proxy, port mapping as above should be enough
-        ipv4_address: 172.16.99.10
+      - sodoff-backend
+    restart: unless-stopped
+
+  db:
+    container_name: sodoff-jsgr-db
+    image: postgres:16.2-alpine
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: sodoff
+      POSTGRES_DB: sodoffdb
+    volumes:
+      - ./db_data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    networks:
+      - sodoff-backend
 
 networks:
-  sodoff_network:
-    name: sodoff_network
-    # bellow network configuration should be put in at least one file
-    #  - but it may be in many or all
-    #  - without it it will work like `external: true`
-    driver: bridge
-    ipam:
-      config:
-        - subnet: "172.16.99.0/24"
+  sodoff-backend:
+
+volumes:
+  postgres_data:

sodoff.sln

@@ -1,22 +1,28 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
+# Visual Studio Version 18
+VisualStudioVersion = 18.9.12120.119 stable
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sodoff", "src\sodoff.csproj", "{B0D39F12-DE8E-4289-82DD-C1F264CC280A}"
 EndProject
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{81DDED9D-158B-E303-5F62-77A2896D2A5A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B0D39F12-DE8E-4289-82DD-C1F264CC280A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B0D39F12-DE8E-4289-82DD-C1F264CC280A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B0D39F12-DE8E-4289-82DD-C1F264CC280A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0D39F12-DE8E-4289-82DD-C1F264CC280A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal

src/appsettings.json

@@ -56,12 +56,12 @@
 
     "// MMOSupportMinVersion": "Minimum client version allowed to use MMO. For example: '0xa3a31a0a' mean SoD 3.31, '0xa0000000' mean all SoD version, 0 mean all games.",
     "MMOSupportMinVersion": "0",
-    
+
     "// LoadNonSoDData": "set to 'true' to support non SoD games, set to 'false' to reduce memory usage",
     "LoadNonSoDData": true,
 
     "// DbProvider": "Select database backend to use: SQLite, PostgreSQL, MySQL (availability may depend on build options)",
-    "DbProvider": "SQLite",
+    "DbProvider": "PostgreSQL",
 
     "// DbPath": "Path to SQLite database file. If empty, \"sodoff.db\" from current directory will be used.",
     "DbPath": "",

src/sodoff.csproj

@@ -16,6 +16,8 @@
     <UserSecretsId>c3333d84-1634-4905-8a19-70a8a5fcf69f</UserSecretsId>
 
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>