From 396447519d1cd3000223e91a6e3ba8337f4cf272 Mon Sep 17 00:00:00 2001 From: noampfeifel Date: Sun, 13 Aug 2023 17:33:25 +0300 Subject: [PATCH 1/3] 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 + From 26dbe36a15c2f26e050e4fe470ee32b6d29448b8 Mon Sep 17 00:00:00 2001 From: noampfeifel Date: Tue, 15 Aug 2023 19:06:05 +0300 Subject: [PATCH 2/3] fixed ports to simple setup, added notes about DB_HOST --- config.yaml | 4 ++-- docker-compose.yml | 5 ++--- mysql.cnf | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 mysql.cnf diff --git a/config.yaml b/config.yaml index 3964764163..c7366a64da 100644 --- a/config.yaml +++ b/config.yaml @@ -159,8 +159,8 @@ worlds: server: #Database Configuration - DB_URL_FORMAT: "jdbc:mysql://%s:3307/cosmic" - DB_HOST: "localhost" + DB_URL_FORMAT: "jdbc:mysql://%s:3306/cosmic" # If the docker ENV for DB_HOST is anything but "db", this string format should be changed from 3306 to 3307 (or whichever port it was changed to in docker) + DB_HOST: "localhost" DB_USER: "cosmic_server" DB_PASS: "snailshell" INIT_CONNECTION_POOL_TIMEOUT: 50 # Seconds diff --git a/docker-compose.yml b/docker-compose.yml index e1ba3d3ab8..27cc604767 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" ## Remember if this is present it will OVERRIDE the host in the config.yaml, this one is optional. + DB_HOST: "db" ## Remember if this is present it will OVERRIDE the host in the config.yaml, if you put here anything other than db, you'll need to change the config.yaml jdbc string to port 3307, and not port 3306 db: image: mysql:8.0.23 @@ -30,8 +30,7 @@ services: cap_add: - SYS_NICE ports: - - "3307:3307" + - "3307:3306" 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 deleted file mode 100644 index 00b720d62e..0000000000 --- a/mysql.cnf +++ /dev/null @@ -1,3 +0,0 @@ -[mysqld] -port=3307 - From b8a360917e47467acdfcded6b12af2d2a2e998af Mon Sep 17 00:00:00 2001 From: noampfeifel Date: Tue, 15 Aug 2023 19:07:34 +0300 Subject: [PATCH 3/3] final fixes --- config.yaml | 2 +- docker-compose.yml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config.yaml b/config.yaml index c7366a64da..c34d9848f0 100644 --- a/config.yaml +++ b/config.yaml @@ -163,7 +163,7 @@ server: DB_HOST: "localhost" DB_USER: "cosmic_server" DB_PASS: "snailshell" - INIT_CONNECTION_POOL_TIMEOUT: 50 # Seconds + INIT_CONNECTION_POOL_TIMEOUT: 90 # Seconds #Login Configuration WORLDS: 1 #Initial number of worlds on the server. diff --git a/docker-compose.yml b/docker-compose.yml index 27cc604767..90bbb04fc0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,8 +27,6 @@ services: MYSQL_DATABASE: "cosmic" MYSQL_USER: "cosmic_server" MYSQL_PASSWORD: "snailshell" - cap_add: - - SYS_NICE ports: - "3307:3306" volumes: