From 410e71e5bd56bfcce2ec5d78daeeaef1449d7676 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 26 Jan 2023 17:24:51 +0800 Subject: [PATCH 1/2] feat: bumb mysql container image version to 8.0.32 --- .github/uffizzi/docker-compose.uffizzi.yml | 2 +- docker-compose/mysql/docker-compose.yml | 2 +- .../nginx-proxy-manager/docker-compose.yml | 2 +- packages/nocodb/docker-compose.yml | 30 +++++++++++-------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/uffizzi/docker-compose.uffizzi.yml b/.github/uffizzi/docker-compose.uffizzi.yml index f91de6e9b7..318ad64367 100644 --- a/.github/uffizzi/docker-compose.uffizzi.yml +++ b/.github/uffizzi/docker-compose.uffizzi.yml @@ -31,7 +31,7 @@ services: MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: password MYSQL_USER: noco - image: "mysql:5.7" + image: "mysql:8.0.32" deploy: resources: limits: diff --git a/docker-compose/mysql/docker-compose.yml b/docker-compose/mysql/docker-compose.yml index 269e397db8..76e2e232cc 100644 --- a/docker-compose/mysql/docker-compose.yml +++ b/docker-compose/mysql/docker-compose.yml @@ -27,7 +27,7 @@ services: - "-h" - localhost timeout: 20s - image: "mysql:5.7" + image: "mysql:8.0.32" restart: always volumes: - "db_data:/var/lib/mysql" diff --git a/docker-compose/nginx-proxy-manager/docker-compose.yml b/docker-compose/nginx-proxy-manager/docker-compose.yml index af535890d5..89409c77c9 100644 --- a/docker-compose/nginx-proxy-manager/docker-compose.yml +++ b/docker-compose/nginx-proxy-manager/docker-compose.yml @@ -46,7 +46,7 @@ services: - "-h" - localhost timeout: 20s - image: "mysql:5.7" + image: "mysql:8.0.32" networks: - default restart: always diff --git a/packages/nocodb/docker-compose.yml b/packages/nocodb/docker-compose.yml index 2df88fb17b..9f12c5a8dc 100644 --- a/packages/nocodb/docker-compose.yml +++ b/packages/nocodb/docker-compose.yml @@ -19,28 +19,32 @@ services: # - 3356:3306 # volumes: # - ./mysql-sakila-db:/docker-entrypoint-initdb.d - db57: - image: mysql:5.7 + # db57: + # image: mysql:5.7 + # restart: always + # environment: + # MYSQL_ROOT_PASSWORD: password + # ports: + # - 3357:3306 + # volumes: + # - ./tests/mysql-sakila-db:/docker-entrypoint-initdb.d + # healthcheck: + # test: "/etc/init.d/mysql status" + # interval: 1s + # retries: 240 + db8032: + image: mysql:8.0.32 restart: always environment: MYSQL_ROOT_PASSWORD: password ports: - - 3357:3306 + - 3380:3306 volumes: - - ./tests/mysql-sakila-db:/docker-entrypoint-initdb.d + - ./mysql-sakila-db:/docker-entrypoint-initdb.d healthcheck: test: "/etc/init.d/mysql status" interval: 1s retries: 240 - # db80: - # image: mysql:8.0 - # restart: always - # environment: - # MYSQL_ROOT_PASSWORD: password - # ports: - # - 3380:3306 - # volumes: - # - ./mysql-sakila-db:/docker-entrypoint-initdb.d # maria102: # image: mariadb:10.2 # restart: always From 404c9f9984248cafcc6e9d6fb2273f82d010932f Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 27 Jan 2023 11:07:11 +0800 Subject: [PATCH 2/2] chore(nocodb): sync with 5.7 volume --- packages/nocodb/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nocodb/docker-compose.yml b/packages/nocodb/docker-compose.yml index 9f12c5a8dc..7fabf799aa 100644 --- a/packages/nocodb/docker-compose.yml +++ b/packages/nocodb/docker-compose.yml @@ -40,7 +40,7 @@ services: ports: - 3380:3306 volumes: - - ./mysql-sakila-db:/docker-entrypoint-initdb.d + - ./tests/mysql-sakila-db:/docker-entrypoint-initdb.d healthcheck: test: "/etc/init.d/mysql status" interval: 1s