mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-07-26 06:26:08 +00:00
chore: harden php8 compatibility, optimize installer/croppers, and refresh docs/admin ux
This commit is contained in:
+7
-10
@@ -1,5 +1,3 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
web:
|
||||
build:
|
||||
@@ -10,7 +8,6 @@ services:
|
||||
- "8080:80"
|
||||
volumes:
|
||||
- ./:/var/www/html
|
||||
- ./var:/var/www/html/var
|
||||
environment:
|
||||
- APACHE_DOCUMENT_ROOT=/var/www/html
|
||||
depends_on:
|
||||
@@ -20,13 +17,13 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
db:
|
||||
image: mysql:5.7
|
||||
image: mariadb:latest
|
||||
container_name: travianz-db
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpassword}
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE:-travian}
|
||||
MYSQL_USER: ${MYSQL_USER:-travianz}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD:-travianzpass}
|
||||
MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD:-${MYSQL_ROOT_PASSWORD:-rootpassword}}
|
||||
MARIADB_DATABASE: ${MARIADB_DATABASE:-${MYSQL_DATABASE:-travian}}
|
||||
MARIADB_USER: ${MARIADB_USER:-${MYSQL_USER:-travianz}}
|
||||
MARIADB_PASSWORD: ${MARIADB_PASSWORD:-${MYSQL_PASSWORD:-travianzpass}}
|
||||
volumes:
|
||||
- db-data:/var/lib/mysql
|
||||
- ./var/db:/docker-entrypoint-initdb.d:ro
|
||||
@@ -35,7 +32,7 @@ services:
|
||||
networks:
|
||||
- travianz-network
|
||||
restart: unless-stopped
|
||||
command: --default-authentication-plugin=mysql_native_password --sql_mode=""
|
||||
command: --sql_mode=""
|
||||
|
||||
phpmyadmin:
|
||||
image: phpmyadmin/phpmyadmin:latest
|
||||
@@ -44,7 +41,7 @@ services:
|
||||
PMA_HOST: db
|
||||
PMA_PORT: 3306
|
||||
PMA_USER: root
|
||||
PMA_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpassword}
|
||||
PMA_PASSWORD: ${MARIADB_ROOT_PASSWORD:-${MYSQL_ROOT_PASSWORD:-rootpassword}}
|
||||
ports:
|
||||
- "8081:80"
|
||||
depends_on:
|
||||
|
||||
Reference in New Issue
Block a user