From 38eb849ef097db4224b1eb0c225ed23de3736d75 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Fri, 29 Jan 2021 17:01:45 +0800 Subject: [PATCH] fix(mysql): upgrade mysql to 1.7.1 for TLS supporting --- .ci/compatibility_tests/docker-compose-mysql-tls.yaml | 3 +-- .github/workflows/run_cts_tests.yaml | 2 +- apps/emqx_auth_mysql/rebar.config | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.ci/compatibility_tests/docker-compose-mysql-tls.yaml b/.ci/compatibility_tests/docker-compose-mysql-tls.yaml index 8117907f5..ab9cbeed3 100644 --- a/.ci/compatibility_tests/docker-compose-mysql-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-mysql-tls.yaml @@ -28,14 +28,13 @@ services: - emqx_bridge command: --bind-address "::" - --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --explicit_defaults_for_timestamp=true --lower_case_table_names=1 --max_allowed_packet=128M --skip-symbolic-links - --ssl-ca=/etc/certs/ca.pem + --ssl-ca=/etc/certs/ca-cert.pem --ssl-cert=/etc/certs/server-cert.pem --ssl-key=/etc/certs/server-key.pem diff --git a/.github/workflows/run_cts_tests.yaml b/.github/workflows/run_cts_tests.yaml index de54b2b8c..fdca76a7c 100644 --- a/.github/workflows/run_cts_tests.yaml +++ b/.github/workflows/run_cts_tests.yaml @@ -121,7 +121,7 @@ jobs: - ipv4 - ipv6 connect_type: - # - tls + - tls - tcp steps: diff --git a/apps/emqx_auth_mysql/rebar.config b/apps/emqx_auth_mysql/rebar.config index a02471969..b86500e8f 100644 --- a/apps/emqx_auth_mysql/rebar.config +++ b/apps/emqx_auth_mysql/rebar.config @@ -1,6 +1,6 @@ {deps, [ - {mysql, {git, "https://github.com/emqx/mysql-otp", {tag, "1.6.1"}}} + {mysql, {git, "https://github.com/emqx/mysql-otp", {tag, "1.7.1"}}} ]}. {edoc_opts, [{preprocess, true}]}.