From 53dc4d1d7eacdce3b7800ede5f3d210eac9b03da Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Thu, 28 Sep 2023 01:37:16 +0900
Subject: [PATCH] Fixed Office365 authentification. Using libcurl instead of
 libcurl-minimal

---
 Dockerfiles/server-mysql/centos/Dockerfile | 8 ++++++++
 Dockerfiles/server-mysql/rhel/Dockerfile   | 8 +++++++-
 Dockerfiles/server-pgsql/centos/Dockerfile | 8 ++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile
index e54091e11..366e7205d 100644
--- a/Dockerfiles/server-mysql/centos/Dockerfile
+++ b/Dockerfiles/server-mysql/centos/Dockerfile
@@ -64,6 +64,14 @@ RUN set -eux && \
             --setopt=install_weak_deps=False \
             --best \
         ${INSTALL_PKGS} && \
+    dnf -y install \
+            --disablerepo "*" \
+            --enablerepo "${REPOLIST}" \
+            --setopt=tsflags=nodocs \
+            --setopt=install_weak_deps=False \
+            --allowerasing \
+            --best \
+        libcurl && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile
index 551cb5a38..3c7b3ff91 100644
--- a/Dockerfiles/server-mysql/rhel/Dockerfile
+++ b/Dockerfiles/server-mysql/rhel/Dockerfile
@@ -63,7 +63,9 @@ RUN set -eux && \
             tzdata \
             iputils \
             hostname \
-            libcurl-minimal \
+            libssh \
+            libpsl \
+            libbrotli \
             libevent \
             openldap \
             libssh \
@@ -96,6 +98,10 @@ RUN set -eux && \
             --best \
             --setopt=tsflags=nodocs \
         tzdata && \
+    microdnf download libcurl && \
+    rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
+    microdnf remove -y libcurl-minimal && \
+    rm -rf "*curl*$( uname -i ).rpm" && \
     groupadd \
             --system \
             --gid 1995 \
diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile
index b99028bbe..a9c8ce560 100644
--- a/Dockerfiles/server-pgsql/centos/Dockerfile
+++ b/Dockerfiles/server-pgsql/centos/Dockerfile
@@ -65,6 +65,14 @@ RUN set -eux && \
             --setopt=install_weak_deps=False \
             --best \
         ${INSTALL_PKGS} && \
+    dnf -y install \
+            --disablerepo "*" \
+            --enablerepo "${REPOLIST}" \
+            --setopt=tsflags=nodocs \
+            --setopt=install_weak_deps=False \
+            --allowerasing \
+            --best \
+        libcurl && \
     groupadd \
             --system \
             --gid 1995 \