From 9bc0427ed0f54f0349646337d906f6b4bbf792a8 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 8 Sep 2020 07:25:38 -0400
Subject: [PATCH] Replaced MariaDB library to MySQL 8

---
 proxy-mysql/centos/Dockerfile      | 6 ++++--
 server-mysql/centos/Dockerfile     | 5 +++--
 web-apache-mysql/centos/Dockerfile | 2 +-
 web-nginx-mysql/centos/Dockerfile  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile
index f5a21e4be..b6c0aba89 100644
--- a/proxy-mysql/centos/Dockerfile
+++ b/proxy-mysql/centos/Dockerfile
@@ -32,13 +32,15 @@ RUN set -eux && \
     mkdir -p /usr/share/doc/zabbix-proxy-mysql && \
     dnf --quiet makecache && \
     dnf -y install epel-release && \
+    dnf -y module enable mysql && \
     dnf -y install --setopt=tsflags=nodocs --setopt=install_weak_deps=False --best \
             libcurl-minimal \
             libevent \
             libssh \
             fping \
             libxml2 \
-            mariadb \
+            mysql \
+            mysql-libs \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
@@ -87,7 +89,7 @@ RUN set -eux && \
             libssh-devel \
             libxml2-devel \
             make \
-            mariadb-connector-c-devel \
+            mysql-devel \
             net-snmp-devel \
             OpenIPMI-devel \
             openldap-devel \
diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile
index 6ffe95250..53602eab6 100644
--- a/server-mysql/centos/Dockerfile
+++ b/server-mysql/centos/Dockerfile
@@ -44,7 +44,8 @@ RUN set -eux && \
             libevent \
             libxml2 \
             libssh \
-            mariadb \
+            mysql \
+            mysql-libs \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
@@ -93,7 +94,7 @@ RUN set -eux && \
             libssh-devel \
             libxml2-devel \
             make \
-            mariadb-connector-c-devel \
+            mysql-devel \
             net-snmp-devel \
             OpenIPMI-devel \
             openldap-devel \
diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile
index ae1eee917..21e21a1e0 100644
--- a/web-apache-mysql/centos/Dockerfile
+++ b/web-apache-mysql/centos/Dockerfile
@@ -23,7 +23,7 @@ RUN set -eux && \
             dejavu-sans-fonts \
             curl \
             httpd \
-            mariadb \
+            mysql \
             mod_ssl \
             php \
             php-fpm \
diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile
index 591cc8fc0..06b859e8f 100644
--- a/web-nginx-mysql/centos/Dockerfile
+++ b/web-nginx-mysql/centos/Dockerfile
@@ -22,7 +22,7 @@ RUN set -eux && \
     dnf -y install epel-release && \
     dnf -y install --setopt=install_weak_deps=False --best --setopt=tsflags=nodocs \
             curl \
-            mariadb \
+            mysql \
             nginx \
             php-bcmath \
             php-fpm \