Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updates env, submodule pointers, dockerfile #4

Open
wants to merge 3 commits into
base: quarm
Choose a base branch
from
Open

updates env, submodule pointers, dockerfile #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a3e24e
updates env, submodule pointers, dockerfile
kai-blt May 14, 2024
454f7a8
updates submodules
kai-blt May 14, 2024
934e817
updates docker compose to include ports for db
kai-blt May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Maps
Open in desktop
Submodule Maps updated 38 files
+ − charasis.path
+ − guktop.path
+ − kurn.path
+ − load.nav
+ − load2.nav
+ − path/bothunder.path
+ − path/codecay.path
+ − path/dawnshroud.path
+ − path/dreadlands.path
+ − path/feerrott.path
+ − path/freportn.path
+ − path/fungusgrove.path
+ − path/greatdivide.path
+ − path/hohonora.path
+ − path/hohonorb.path
+ − path/kedge.path
+ − path/lakeofillomen.path
+ − path/maiden.path
+ − path/neriakb.path
+ − path/neriakc.path
+ − path/poair.path
+ − path/podisease.path
+ − path/poinnovation.path
+ − path/pojustice.path
+ − path/poknowledge.path
+ − path/potactics.path
+ − path/potimeb.path
+ − path/potorment.path
+ − path/qeynos2.path
+ − path/solrotower.path
+ − path/sseru.path
+ − path/tenebrous.path
+ − path/umbral.path
+ − path/vexthal.path
+ − path/westwastes.path
+ − permafrost.map
+ − powar.nav
+ − qrg.nav
2 changes: 1 addition & 1 deletion Quests
Open in desktop
Submodule Quests updated 424 files
2 changes: 1 addition & 1 deletion Server
Open in desktop
Submodule Server updated 199 files
2 changes: 1 addition & 1 deletion containers/database/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down