extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-30 14:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Ubuntu to 24.04

Browse Source
This commit is contained in:
Alexey Pustovalov
2024-04-24 02:18:27 +09:00
parent fac9a4398f
commit 599e7ab4b9
48 changed files with 98 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
View File

@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} AS builder
FROM ubuntu:jammy
FROM ubuntu:noble
ARG MAJOR_VERSION
ARG ZBX_VERSION
@ -41,12 +41,12 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
mysql-client \
locales \
libldap-common \
php8.1-bcmath \
php8.1-gd \
php8.1-ldap \
php8.1-mbstring \
php8.1-mysql \
php8.1-xml" && \
php8.3-bcmath \
php8.3-gd \
php8.3-ldap \
php8.3-mbstring \
php8.3-mysql \
php8.3-xml" && \
apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install \
@ -98,9 +98,9 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
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/php/8.1/ && \
chgrp -R 0 /etc/apache2/ /etc/php/8.1/ && \
chmod -R g=u /etc/apache2/ /etc/php/8.1/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php/8.3/ && \
chgrp -R 0 /etc/apache2/ /etc/php/8.3/ && \
chmod -R g=u /etc/apache2/ /etc/php/8.3/ && \
apt-get -y autoremove && \
apt-get -y clean

0
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.1/apache2/conf.d/99-zabbix.ini → Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/apache2/conf.d/99-zabbix.ini
View File

4
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_envvars Normal file
View File

@ -0,0 +1,4 @@
export APACHE_RUN_USER=zabbix
export APACHE_RUN_GROUP=zabbix
export APACHE_PID_FILE=/tmp/apache2.pid
export APACHE_RUN_DIR=/tmp

2
Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -135,6 +135,8 @@ check_db_connect() {
prepare_web_server() {
APACHE_SITES_DIR="/etc/apache2/sites-enabled"
ln -sfT "$ZABBIX_ETC_DIR/apache_envvars" "/etc/apache2/envvars"
echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then
ln -sfT "$ZABBIX_ETC_DIR/apache.conf" "$APACHE_SITES_DIR/zabbix.conf"