diff --git a/docker-compose.dcproj b/docker-compose.dcproj
index 0d8feee..fc70a6e 100644
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -3,6 +3,10 @@
2.1
Linux
+ 81dded9d-158b-e303-5f62-77a2896d2a5a
+ LaunchBrowser
+ {Scheme}://localhost:{ServicePort}
+ sodoff
@@ -11,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 19d4da5..5ef92a8 100644
--- a/docker-compose.yml
+++ b/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:
\ No newline at end of file
diff --git a/sodoff.sln b/sodoff.sln
index fede79e..24736a6 100644
--- a/sodoff.sln
+++ b/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
diff --git a/src/appsettings.json b/src/appsettings.json
index 7bfab7a..6dd5fc9 100644
--- a/src/appsettings.json
+++ b/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": "",
diff --git a/src/sodoff.csproj b/src/sodoff.csproj
index 6beb2d4..fd9405e 100644
--- a/src/sodoff.csproj
+++ b/src/sodoff.csproj
@@ -16,6 +16,8 @@
c3333d84-1634-4905-8a19-70a8a5fcf69f
Linux
+
+ ..\docker-compose.dcproj