diff --git a/tutor/templates/k8s/deployments.yml b/tutor/templates/k8s/deployments.yml index c9f7ad90ab..bf50b48eb7 100644 --- a/tutor/templates/k8s/deployments.yml +++ b/tutor/templates/k8s/deployments.yml @@ -397,12 +397,7 @@ spec: - "--character-set-server=utf8mb4" - "--collation-server=utf8mb4_unicode_ci" - "--binlog-expire-logs-seconds=259200" - # We only require this option for MySQL 8.4.0 and above - # Breaks MySQL for previous versions as this option does not exist on versions earlier than 8.4.0 - {% set mysql_version = DOCKER_IMAGE_MYSQL.split(':')[-1] -%} - {% if mysql_version == "latest" or (mysql_version.split('.') | map('int') | list >= '8.4.0'.split('.') | map('int') | list) -%} - "--mysql-native-password=ON" - {%- endif %} env: - name: MYSQL_ROOT_PASSWORD value: "{{ MYSQL_ROOT_PASSWORD }}" diff --git a/tutor/templates/local/docker-compose.yml b/tutor/templates/local/docker-compose.yml index b386f869b4..da33b653ff 100644 --- a/tutor/templates/local/docker-compose.yml +++ b/tutor/templates/local/docker-compose.yml @@ -45,12 +45,7 @@ services: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --binlog-expire-logs-seconds=259200 - # We only require this option for MySQL 8.4.0 and above - # Breaks MySQL for previous versions as this option does not exist on versions earlier than 8.4.0 - {% set mysql_version = DOCKER_IMAGE_MYSQL.split(':')[-1] -%} - {% if mysql_version == "latest" or (mysql_version.split('.') | map('int') | list >= '8.4.0'.split('.') | map('int') | list) -%} --mysql-native-password=ON - {%- endif %} restart: unless-stopped user: "999:999" volumes: