From 396447519d1cd3000223e91a6e3ba8337f4cf272 Mon Sep 17 00:00:00 2001 From: noampfeifel Date: Sun, 13 Aug 2023 17:33:25 +0300 Subject: [PATCH] fixing compose port and config string for db --- config.yaml | 4 ++-- docker-compose.yml | 7 ++++++- mysql.cnf | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 mysql.cnf diff --git a/config.yaml b/config.yaml index 3fae109d3c..3964764163 100644 --- a/config.yaml +++ b/config.yaml @@ -159,11 +159,11 @@ worlds: server: #Database Configuration - DB_URL_FORMAT: "jdbc:mysql://%s:3306/cosmic" + DB_URL_FORMAT: "jdbc:mysql://%s:3307/cosmic" DB_HOST: "localhost" DB_USER: "cosmic_server" DB_PASS: "snailshell" - INIT_CONNECTION_POOL_TIMEOUT: 90 # Seconds + INIT_CONNECTION_POOL_TIMEOUT: 50 # Seconds #Login Configuration WORLDS: 1 #Initial number of worlds on the server. diff --git a/docker-compose.yml b/docker-compose.yml index e6861b0004..e1ba3d3ab8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - ./scripts:/opt/server/scripts - ./wz:/opt/server/wz environment: - DB_HOST: "db" + DB_HOST: "db" ## Remember if this is present it will OVERRIDE the host in the config.yaml, this one is optional. db: image: mysql:8.0.23 @@ -27,6 +27,11 @@ services: MYSQL_DATABASE: "cosmic" MYSQL_USER: "cosmic_server" MYSQL_PASSWORD: "snailshell" + cap_add: + - SYS_NICE + ports: + - "3307:3307" volumes: - ./database/docker-db-data:/var/lib/mysql - ./database/sql:/docker-entrypoint-initdb.d + - ./mysql.cnf:/etc/mysql/conf.d/mysql.cnf ## conf file for mysql internal container, relevant only if mysql host is not 'db' as mentioned above diff --git a/mysql.cnf b/mysql.cnf new file mode 100644 index 0000000000..00b720d62e --- /dev/null +++ b/mysql.cnf @@ -0,0 +1,3 @@ +[mysqld] +port=3307 +