extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-23 06:49:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated PHP for Alpine and Oracle Linux

Browse Source
This commit is contained in:
Alexey Pustovalov 2022-05-31 22:29:54 +03:00
parent 5f35f580e1
commit f2d61c731a
21 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Dockerfiles/web-apache-mysql/alpine/Dockerfile
View File

@ -35,22 +35,22 @@ RUN set -eux && \
curl \
mariadb-client \
mariadb-connector-c \
php8-apache2 \
php8-bcmath \
php8-ctype \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-mbstring \
php8-mysqli \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl" && \
php81-apache2 \
php81-bcmath \
php81-ctype \
php81-gd \
php81-gettext \
php81-json \
php81-ldap \
php81-mbstring \
php81-mysqli \
php81-session \
php81-simplexml \
php81-sockets \
php81-fileinfo \
php81-xmlreader \
php81-xmlwriter \
php81-openssl" && \
apk add \
--no-cache \
--clean-protected \
@ -99,9 +99,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php8/ && \
chgrp -R 0 /etc/apache2/ /etc/php8/ && \
chmod -R g=u /etc/apache2/ /etc/php8/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php81/ && \
chgrp -R 0 /etc/apache2/ /etc/php81/ && \
chmod -R g=u /etc/apache2/ /etc/php81/ && \
rm -rf /var/cache/apk/*
EXPOSE 8080/TCP 8443/TCP

0
Dockerfiles/web-apache-mysql/alpine/conf/etc/php8/conf.d/99-zabbix.ini → Dockerfiles/web-apache-mysql/alpine/conf/etc/php81/conf.d/99-zabbix.ini
View File

2
Dockerfiles/web-apache-mysql/centos/Dockerfile
View File

@ -50,7 +50,7 @@ RUN set -eux && \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable mysql && \
dnf -y module enable php:7.4 && \
dnf -y module enable php:8.0 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

2
Dockerfiles/web-apache-mysql/ol/Dockerfile
View File

@ -49,7 +49,7 @@ RUN set -eux && \
glibc-locale-source \
supervisor" && \
microdnf -y module enable mysql && \
microdnf -y module enable php:7.4 && \
microdnf -y module enable php:8.0 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

38
Dockerfiles/web-apache-pgsql/alpine/Dockerfile
View File

@ -33,22 +33,22 @@ RUN set -eux && \
INSTALL_PKGS="bash \
apache2 \
curl \
php8-apache2 \
php8-bcmath \
php8-ctype \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-pgsql \
php8-mbstring \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl \
php81-apache2 \
php81-bcmath \
php81-ctype \
php81-gd \
php81-gettext \
php81-json \
php81-ldap \
php81-pgsql \
php81-mbstring \
php81-session \
php81-simplexml \
php81-sockets \
php81-fileinfo \
php81-xmlreader \
php81-xmlwriter \
php81-openssl \
postgresql-client" && \
apk add \
--no-cache \
@ -98,9 +98,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php8/ && \
chgrp -R 0 /etc/apache2/ /etc/php8/ && \
chmod -R g=u /etc/apache2/ /etc/php8/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php81/ && \
chgrp -R 0 /etc/apache2/ /etc/php81/ && \
chmod -R g=u /etc/apache2/ /etc/php81/ && \
rm -rf /var/cache/apk/*
EXPOSE 8080/TCP 8443/TCP

0
Dockerfiles/web-apache-pgsql/alpine/conf/etc/php8/conf.d/99-zabbix.ini → Dockerfiles/web-apache-pgsql/alpine/conf/etc/php81/conf.d/99-zabbix.ini
View File

2
Dockerfiles/web-apache-pgsql/centos/Dockerfile
View File

@ -49,7 +49,7 @@ RUN set -eux && \
glibc-locale-source \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable php:7.4 && \
dnf -y module enable php:8.0 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

2
Dockerfiles/web-apache-pgsql/ol/Dockerfile
View File

@ -48,7 +48,7 @@ RUN set -eux && \
findutils \
glibc-locale-source \
supervisor" && \
microdnf -y module enable php:7.4 && \
microdnf -y module enable php:8.0 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

40
Dockerfiles/web-nginx-mysql/alpine/Dockerfile
View File

@ -35,22 +35,22 @@ RUN set -eux && \
mariadb-client \
mariadb-connector-c \
nginx \
php8-bcmath \
php8-ctype \
php8-fpm \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-mbstring \
php8-mysqli \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl \
php81-bcmath \
php81-ctype \
php81-fpm \
php81-gd \
php81-gettext \
php81-json \
php81-ldap \
php81-mbstring \
php81-mysqli \
php81-session \
php81-simplexml \
php81-sockets \
php81-fileinfo \
php81-xmlreader \
php81-xmlwriter \
php81-openssl \
supervisor" && \
apk add \
--no-cache \
@ -79,7 +79,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix/web && \
mkdir -p /etc/zabbix/web/certs && \
mkdir -p /var/lib/php/session && \
rm -rf /etc/php8/php-fpm.d/www.conf && \
rm -rf /etc/php81/php-fpm.d/www.conf && \
rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
cd /usr/share/zabbix/ && \
@ -93,9 +93,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chmod -R g=u /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
chmod -R g=u /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \
chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \
chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ && \

2
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.conf
View File

@ -1,4 +1,4 @@
include=/etc/php8/php-fpm.d/*.conf
include=/etc/php81/php-fpm.d/*.conf
[global]

0
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.d/zabbix.conf
View File

4
Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0
[program:php-fpm8]
command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf
[program:php-fpm81]
command = /usr/sbin/%(program_name)s -F -y /etc/php81/php-fpm.conf
auto_start = true
autorestart = true

2
Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -143,7 +143,7 @@ prepare_web_server() {
prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file"
PHP_CONFIG_FILE="/etc/php8/php-fpm.d/zabbix.conf"
PHP_CONFIG_FILE="/etc/php81/php-fpm.d/zabbix.conf"
export PHP_FPM_PM=${PHP_FPM_PM:-"dynamic"}
export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"}

2
Dockerfiles/web-nginx-mysql/ol/Dockerfile
View File

@ -47,7 +47,7 @@ RUN set -eux && \
glibc-locale-source \
supervisor" && \
microdnf -y module enable mysql && \
microdnf -y module enable php:7.4 && \
microdnf -y module enable php:8.0 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

40
Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
View File

@ -33,22 +33,22 @@ RUN set -eux && \
INSTALL_PKGS="bash \
curl \
nginx \
php8-bcmath \
php8-ctype \
php8-fpm \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-mbstring \
php8-pgsql \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl \
php81-bcmath \
php81-ctype \
php81-fpm \
php81-gd \
php81-gettext \
php81-json \
php81-ldap \
php81-mbstring \
php81-pgsql \
php81-session \
php81-simplexml \
php81-sockets \
php81-fileinfo \
php81-xmlreader \
php81-xmlwriter \
php81-openssl \
postgresql-client \
supervisor" && \
apk add \
@ -78,7 +78,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix/web && \
mkdir -p /etc/zabbix/web/certs && \
mkdir -p /var/lib/php/session && \
rm -rf /etc/php8/php-fpm.d/www.conf && \
rm -rf /etc/php81/php-fpm.d/www.conf && \
rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
cd /usr/share/zabbix/ && \
@ -92,9 +92,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chmod -R g=u /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
chmod -R g=u /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \
chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \
chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ && \

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.conf → Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.conf
View File

@ -1,4 +1,4 @@
include=/etc/php8/php-fpm.d/*.conf
include=/etc/php81/php-fpm.d/*.conf
[global]

0
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.d/zabbix.conf
View File

4
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0
[program:php-fpm8]
command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf
[program:php-fpm81]
command = /usr/sbin/%(program_name)s -F -y /etc/php81/php-fpm.conf
auto_start = true
autorestart = true

2
Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -143,7 +143,7 @@ prepare_web_server() {
prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file"
PHP_CONFIG_FILE="/etc/php8/php-fpm.d/zabbix.conf"
PHP_CONFIG_FILE="/etc/php81/php-fpm.d/zabbix.conf"
export PHP_FPM_PM=${PHP_FPM_PM:-"dynamic"}
export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"}

2
Dockerfiles/web-nginx-pgsql/ol/Dockerfile
View File

@ -46,7 +46,7 @@ RUN set -eux && \
php-xml \
postgresql \
supervisor" && \
microdnf -y module enable php:7.4 && \
microdnf -y module enable php:8.0 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

2
Dockerfiles/web-service/rhel/Dockerfile
View File

@ -15,7 +15,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm \
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
PATH=/usr/lib64/chromium-browser:$PATH \
PATH=/usr/lib64/chromium-browser:$PATH
LABEL description="Zabbix web service for performing various tasks using headless web browser" \
maintainer="alexey.pustovalov@zabbix.com" \