From 5a3e24e3805c63f1ab93dbab4b0dfb4e24b06d05 Mon Sep 17 00:00:00 2001 From: kai-blt Date: Tue, 14 May 2024 13:19:32 -0700 Subject: [PATCH 1/3] updates env, submodule pointers, dockerfile --- .env.example | 12 ++++++------ .gitmodules | 6 +++--- containers/database/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.env.example b/.env.example index 9934511..65c89aa 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ -DATABASE_USER=eqmac -DATABASE_PASSWORD=eqmacpassword -DATABASE_NAME=eqmac -SERVER_ADDRESS=192.168.1.100 -SERVER_SHORT_NAME=EQMac Docker -SERVER_LONG_NAME=EQMac Docker +DATABASE_USER=quarm +DATABASE_PASSWORD=quarmpassword +DATABASE_NAME=quarm +SERVER_ADDRESS=127.0.0.1 +SERVER_SHORT_NAME=Quarm Docker +SERVER_LONG_NAME=Quarm Docker diff --git a/.gitmodules b/.gitmodules index aaefbe0..f051b15 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "Server"] path = Server - url = https://github.com/SecretsOTheP/EQMacEmu + url = https://github.com/kai-blt/EQMacEmu [submodule "Quests"] path = Quests - url = https://github.com/SecretsOTheP/quests + url = https://github.com/kai-blt/quests [submodule "Maps"] path = Maps - url = https://github.com/EQMacEmu/Maps + url = https://github.com/kai-blt/Maps diff --git a/containers/database/Dockerfile b/containers/database/Dockerfile index 9e9c297..acbcac3 100644 --- a/containers/database/Dockerfile +++ b/containers/database/Dockerfile @@ -1,6 +1,6 @@ FROM mariadb:10.5 -ADD Server/utils/sql/database_full/quarm_2023-11-29-15_56.tar.gz /docker-entrypoint-initdb.d +ADD Server/utils/sql/database_full/quarm_2024-04-15-22_51.tar.gz /docker-entrypoint-initdb.d RUN rm /docker-entrypoint-initdb.d/drop_system.sql ADD Server/loginserver/login_util/tblloginserversettings.sql /docker-entrypoint-initdb.d From 454f7a8f958e132b8819b144b5f181c70a79dc53 Mon Sep 17 00:00:00 2001 From: kai-blt Date: Tue, 14 May 2024 13:24:50 -0700 Subject: [PATCH 2/3] updates submodules --- Maps | 2 +- Quests | 2 +- Server | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Maps b/Maps index dcdfac3..f00f483 160000 --- a/Maps +++ b/Maps @@ -1 +1 @@ -Subproject commit dcdfac39fab296074b2428071dcee81983c67f0d +Subproject commit f00f483e3052e2ac1f6d0cc2610bddf52c510db0 diff --git a/Quests b/Quests index 3b66289..f8dc82d 160000 --- a/Quests +++ b/Quests @@ -1 +1 @@ -Subproject commit 3b66289e9c99d7edac9b6c2ed7abfb9cf71e3d0c +Subproject commit f8dc82d616e34cd6a9add311b0e210d9d80e2515 diff --git a/Server b/Server index 3f49755..3c21083 160000 --- a/Server +++ b/Server @@ -1 +1 @@ -Subproject commit 3f497550b9793faa49ed057b7f4e805f3f8dfa3b +Subproject commit 3c21083428bbb445d98446cbb6d943061bbcfadd From 934e8171f07c5a517693230fcc3100f64e1a7611 Mon Sep 17 00:00:00 2001 From: kai-blt Date: Tue, 14 May 2024 19:17:05 -0700 Subject: [PATCH 3/3] updates docker compose to include ports for db --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 5cfbf6a..3dbd35c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,6 +94,8 @@ services: MYSQL_USER: ${DATABASE_USER:-eq} MYSQL_PASSWORD: ${DATABASE_PASSWORD:-eq} MYSQL_DATABASE: ${DATABASE_NAME:-eq} + ports: + - 3306:3306/tcp volumes: - database:/var/lib/mysql