Updated CentOS images

web-apache-mysql/alpine/docker-entrypoint.sh

@@ -57,6 +57,10 @@ file_env() {
     unset "$fileVar"
 }
 
+prepare_system() {
+    echo "** Preparing the system"
+}
+
 escape_spec_char() {
     local var_value=$1
 
@@ -199,6 +203,10 @@ prepare_web_server() {
     fi
 }
 
+clear_deploy() {
+    echo "** Cleaning the system"
+}
+
 prepare_zbx_web_config() {
     local server_name=""
 

web-apache-mysql/centos/Dockerfile

@@ -31,6 +31,12 @@ RUN set -eux && \
             php-mbstring \
             php-mysql \
             php-xml && \
+    rm -f "/etc/httpd/conf.d/default.conf" && \
+    rm -f "/etc/httpd/conf.d/ssl.conf" && \
+    sed -ri \
+        -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
+        -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
+        "/etc/httpd/conf/httpd.conf" && \
     sed -i 's/Listen 80/Listen 8080/g' /etc/httpd/conf/httpd.conf && \
     yum -y clean all && \
     rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
@@ -72,6 +78,9 @@ RUN set -eux && \
     chown --quiet -R zabbix:root /etc/httpd/ /etc/php.d/ /etc/php.ini && \
     chgrp -R 0 /etc/httpd/ /etc/php.d/ /etc/php.ini && \
     chmod -R g=u /etc/httpd/ /etc/php.d/ /etc/php.ini && \
+    chown --quiet -R zabbix:root /run/httpd/ /var/lib/php/session/ && \
+    chgrp -R 0 /run/httpd/ /var/lib/php/session/ && \
+    chmod -R g=u /run/httpd/ /var/lib/php/session/ && \
     yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
     yum -y clean all && \
     rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \

web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf

@@ -0,0 +1,3 @@
+<IfModule !mpm_netware_module>
+    PidFile "/tmp/httpd.pid"
+</IfModule>

web-apache-mysql/centos/docker-entrypoint.sh

@@ -57,6 +57,10 @@ file_env() {
     unset "$fileVar"
 }
 
+prepare_system() {
+    echo "** Preparing the system"
+}
+
 escape_spec_char() {
     local var_value=$1
 
@@ -178,7 +182,7 @@ check_db_connect() {
 }
 
 prepare_web_server() {
-    APACHE_SITES_DIR=/etc/apache2/conf.d
+    APACHE_SITES_DIR=/etc/httpd/conf.d
 
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then
@@ -199,6 +203,10 @@ prepare_web_server() {
     fi
 }
 
+clear_deploy() {
+    echo "** Cleaning the system"
+}
+
 prepare_zbx_web_config() {
     local server_name=""