From 25533ab12b6291bf91f6f50b0f5fb2c2c43f84f1 Mon Sep 17 00:00:00 2001 From: Sabih S <67878058+kleenkanteen@users.noreply.github.com> Date: Sun, 23 Jun 2024 05:04:09 +0000 Subject: [PATCH] fix: docker compose errors --- database/struct_node.sql | 2 +- docker-compose.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/database/struct_node.sql b/database/struct_node.sql index 9ceffb9c..14cca9ec 100644 --- a/database/struct_node.sql +++ b/database/struct_node.sql @@ -39,7 +39,7 @@ CREATE TABLE `job_header` ( `jobheaderid` int(11) NOT NULL AUTO_INCREMENT, `jobid` int(11) NOT NULL DEFAULT '0', `key` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', - `value` text COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `value` text COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (`jobheaderid`), KEY `jobid` (`jobid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/docker-compose.yml b/docker-compose.yml index 26f9c495..3508776b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,8 @@ version: "3.9" services: mysql-master: - image: mysql:8 - command: --default-authentication-plugin=mysql_native_password --sql_mode="" --skip-name-resolve --tls-version="" + image: mysql:8.4 + command: --skip-name-resolve environment: MYSQL_ROOT_PASSWORD: ${MASTER_MYSQL_ROOT_PASSWORD} MYSQL_DATABASE: ${MASTER_MYSQL_DATABASE} @@ -18,8 +18,8 @@ services: - ./database/struct_master.sql:/docker-entrypoint-initdb.d/00_struct_master.sql - ./docker-data/config/config_master.sql:/docker-entrypoint-initdb.d/01_config_master.sql mysql-node: - image: mysql:8 - command: --default-authentication-plugin=mysql_native_password --sql_mode="" --skip-name-resolve --tls-version="" + image: mysql:8.4 + command: --skip-name-resolve environment: MYSQL_ROOT_PASSWORD: ${NODE_MYSQL_ROOT_PASSWORD} MYSQL_DATABASE: ${NODE_MYSQL_DATABASE}