Merge branch 'master' into feat/postgresql-database
# Conflicts: # database/sql/1-db_database.sql # docker-compose.yml # pom.xml # scripts/npc/mapleTV.js # src/main/java/net/server/Server.java
This commit is contained in:
@@ -32,7 +32,6 @@ services:
|
||||
- "3307:3306"
|
||||
volumes:
|
||||
- ./database/docker-db-data:/var/lib/mysql
|
||||
- ./database/sql:/docker-entrypoint-initdb.d
|
||||
|
||||
pg_db:
|
||||
image: postgres:15.0
|
||||
|
||||
Reference in New Issue
Block a user