From 0e4023fe5425b31b3c076f4beefa1ea44561a434 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 2 Sep 2020 00:40:34 +0300
Subject: [PATCH] Fixed RHEL images

---
 java-gateway/rhel/Dockerfile                                   | 2 ++
 web-nginx-mysql/rhel/Dockerfile                                | 3 +++
 .../rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java-gateway/rhel/Dockerfile b/java-gateway/rhel/Dockerfile
index 8977a9965..cd87ec215 100644
--- a/java-gateway/rhel/Dockerfile
+++ b/java-gateway/rhel/Dockerfile
@@ -51,6 +51,8 @@ RUN set -eux && INSTALL_PKGS="bash \
             -d /var/lib/zabbix/ -u 1997 \
         zabbix && \
     mkdir -p /etc/zabbix/ && \
+    mkdir -p /usr/sbin/zabbix_java/ && \
+    mkdir -p /usr/sbin/zabbix_java/ext_lib/ && \
     dnf -y clean all && \
     rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
     rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
diff --git a/web-nginx-mysql/rhel/Dockerfile b/web-nginx-mysql/rhel/Dockerfile
index ded53a141..4ccdb065d 100644
--- a/web-nginx-mysql/rhel/Dockerfile
+++ b/web-nginx-mysql/rhel/Dockerfile
@@ -103,6 +103,9 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr
     chown --quiet -R zabbix:root /var/lib/php/session/ && \
     chgrp -R 0 /var/lib/php/session/ && \
     chmod -R g=u /var/lib/php/session/ && \
+    chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
+    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
+    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
     dnf -y history undo `dnf history list last -q | sed -n 3p |column -t | cut -d' ' -f1` && \
     dnf -y erase glibc-locale-source glibc-langpack-en && \
     dnf -y clean all && \
diff --git a/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf b/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf
index 56e330bae..5b10705cf 100644
--- a/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf
+++ b/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf
@@ -2,7 +2,7 @@
 nodaemon = true
 
 [program:nginx]
-command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf
+command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf
 auto_start = true
 autorestart = true