1 Commits
nightly ... pg

Author SHA1 Message Date
702d225db4 Change: PG stuff 2025-06-16 22:35:38 +01:00
3 changed files with 29 additions and 77 deletions

View File

@ -5,17 +5,14 @@ GAME_IMAGE=git.old-metin2.com/metin2/server:latest
WEB_IMAGE=git.old-metin2.com/metin2/web:latest
################################################################################
# MySQL settings
# PostgreSQL settings
################################################################################
MYSQL_HOST=mysql
MYSQL_USER=root
MYSQL_PASSWORD=metin2
MYSQL_PORT=3306
MYSQL_EXTERNAL_PORT=3306
MYSQL_DB_ACCOUNT=account
MYSQL_DB_PLAYER=player
MYSQL_DB_COMMON=common
MYSQL_DB_LOG=log
POSTGRES_HOST=postgresql
POSTGRES_USER=server
POSTGRES_PASSWORD=metin2
POSTGRES_PORT=5432
POSTGRES_EXTERNAL_PORT=5432
POSTGRES_DB=account
################################################################################
# Web app settings

View File

@ -1,5 +0,0 @@
CREATE DATABASE account CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE DATABASE common CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE DATABASE log CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE DATABASE player CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE DATABASE website CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

View File

@ -1,9 +1,10 @@
x-environment: &common-environment
MARIADB_HOST: ${MARIADB_HOST}
MARIADB_USER: ${MARIADB_USER}
MARIADB_PASSWORD: ${MARIADB_PASSWORD}
MARIADB_PORT: ${MARIADB_PORT}
MARIADB_DB: ${MARIADB_DB}
POSTGRES_HOST: ${POSTGRES_HOST}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_PORT: ${POSTGRES_PORT}
POSTGRES_EXTERNAL_PORT: ${POSTGRES_EXTERNAL_PORT}
POSTGRES_DB: ${POSTGRES_DB}
TEST_SERVER: ${TEST_SERVER}
@ -15,64 +16,24 @@ x-environment: &common-environment
WEB_APP_URL: ${WEB_APP_URL}
WEB_APP_KEY: ${WEB_APP_KEY}
name: Metin2
services:
# MySQL Database
mysql:
image: mariadb:lts
# PostgreSQL Database
postgresql:
image: postgresql:16
restart: always
environment:
# Password for root access
MARIADB_ROOT_PASSWORD: ${MARIADB_PASSWORD}
POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
ports:
- "${MARIADB_EXTERNAL_PORT}:${MARIADB_PORT}"
- "${POSTGRES_EXTERNAL_PORT}:${POSTGRES_PORT}"
expose:
- ${MARIADB_PORT}
- ${POSTGRES_PORT}
volumes:
- ./storage/database/:/var/lib/mysql/
- ./assets/db-init/:/docker-entrypoint-initdb.d/:ro
- ./storage/database/:/var/lib/postgresql/data/
healthcheck:
test: mysqladmin ping -h localhost -u root -p$$MARIADB_ROOT_PASSWORD
interval: 10s
timeout: 5s
retries: 5
# Web management system
web:
image: ${WEB_IMAGE}
restart: always
environment:
# Application config
APP_NAME: ${WEB_APP_NAME}
APP_ENV: ${WEB_APP_ENV}
APP_KEY: ${WEB_APP_KEY}
APP_URL: ${WEB_APP_URL}
# Database credentials
DB_HOST: ${MARIADB_HOST}
DB_PORT: ${MARIADB_PORT}
DB_USERNAME: ${MARIADB_USER}
DB_PASSWORD: ${MARIADB_PASSWORD}
# E-mail config
MAIL_MAILER: ${WEB_MAIL_MAILER}
MAIL_HOST: ${WEB_MAIL_HOST}
MAIL_PORT: ${WEB_MAIL_PORT}
MAIL_USERNAME: ${WEB_MAIL_USERNAME}
MAIL_PASSWORD: ${WEB_MAIL_PASSWORD}
MAIL_ENCRYPTION: ${WEB_MAIL_ENCRYPTION}
MAIL_FROM_ADDRESS: ${WEB_MAIL_FROM_ADDRESS}
MAIL_FROM_NAME: ${WEB_MAIL_FROM_NAME}
ports:
- "${WEB_EXTERNAL_PORT}:80"
volumes:
- ./storage/web/:/app/storage/
depends_on:
mysql:
condition: service_healthy
healthcheck:
test: curl --fail http://localhost:80/ || exit 1
test: pg_isready -d $POSTGRES_DB
interval: 10s
timeout: 5s
retries: 5
@ -88,7 +49,7 @@ services:
volumes:
- ./storage/log/db/:/app/log/
depends_on:
mysql:
postgresql:
condition: service_healthy
# Auth server
@ -97,7 +58,6 @@ services:
restart: always
environment:
<<: *common-environment
MARIADB_DB: ${MARIADB_DB}
GAME_HOSTNAME: auth
GAME_CHANNEL: 1
GAME_AUTH_SERVER: master
@ -112,7 +72,7 @@ services:
volumes:
- ./storage/log/auth/:/app/log/
depends_on:
mysql:
postgresql:
condition: service_healthy
# Game server (CH1)
@ -137,7 +97,7 @@ services:
- ./storage/log/ch1/first/:/app/log/
- ./storage/mark/:/app/mark/
depends_on:
mysql:
postgresql:
condition: service_healthy
ch1_game1:
@ -160,7 +120,7 @@ services:
volumes:
- ./storage/log/ch1/game1/:/app/log/
depends_on:
mysql:
postgresql:
condition: service_healthy
ch1_game2:
@ -183,7 +143,7 @@ services:
volumes:
- ./storage/log/ch1/game2/:/app/log/
depends_on:
mysql:
postgresql:
condition: service_healthy
# Game server (game99)
@ -207,5 +167,5 @@ services:
volumes:
- ./storage/log/game99/:/app/log/
depends_on:
mysql:
postgresql:
condition: service_healthy