From 19f5517b96ee5ee2aafb93dd7932a5e6bd3f0bc8 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 12 Jul 2022 09:20:00 -0700 Subject: [PATCH] Add /etc/mysql/mysql.conf.d in 5.7 Oracle-based images This brings them back to parity with Debian (although noting that the Debian-based 8.0 images have never included this, so I'm not adding it there). --- 5.7/Dockerfile.oracle | 3 +++ template/Dockerfile.oracle | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/5.7/Dockerfile.oracle b/5.7/Dockerfile.oracle index 3d2329e2b..882bdb369 100644 --- a/5.7/Dockerfile.oracle +++ b/5.7/Dockerfile.oracle @@ -89,6 +89,9 @@ RUN set -eux; \ ! grep -F '!includedir' /etc/my.cnf; \ { echo; echo '!includedir /etc/mysql/conf.d/'; } >> /etc/my.cnf; \ mkdir -p /etc/mysql/conf.d; \ +# 5.7 Debian-based images also included "/etc/mysql/mysql.conf.d" so let's include it too + { echo '!includedir /etc/mysql/mysql.conf.d/'; } >> /etc/my.cnf; \ + mkdir -p /etc/mysql/mysql.conf.d; \ \ mysqld --version; \ mysql --version diff --git a/template/Dockerfile.oracle b/template/Dockerfile.oracle index 4d9865e7e..2f2e0b957 100644 --- a/template/Dockerfile.oracle +++ b/template/Dockerfile.oracle @@ -104,6 +104,11 @@ RUN set -eux; \ ! grep -F '!includedir' /etc/my.cnf; \ { echo; echo '!includedir /etc/mysql/conf.d/'; } >> /etc/my.cnf; \ mkdir -p /etc/mysql/conf.d; \ +{{ if env.version == "5.7" then ( -}} +# 5.7 Debian-based images also included "/etc/mysql/mysql.conf.d" so let's include it too + { echo '!includedir /etc/mysql/mysql.conf.d/'; } >> /etc/my.cnf; \ + mkdir -p /etc/mysql/mysql.conf.d; \ +{{ ) else "" end -}} \ mysqld --version; \ mysql --version