extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-20 01:47:43 +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 18:56:11 +09:00
parent 83b0bf637f
commit 8f4159432a
9 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/agent/ubuntu/Dockerfile
View File

@ -37,8 +37,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
tzdata \ tzdata \
ca-certificates \ ca-certificates \
libssl3 \ libssl3t64 \
libcurl4 \ libcurl4t64 \
libmodbus5 \ libmodbus5 \
libpcre2-8-0 \ libpcre2-8-0 \
libldap-2.4 \ libldap-2.4 \

4
Dockerfiles/agent2/ubuntu/Dockerfile
View File

@ -43,8 +43,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
ca-certificates \ ca-certificates \
smartmontools \ smartmontools \
sudo \ sudo \
libssl3 \ libssl3t64 \
libcurl4 \ libcurl4t64 \
libpcre2-8-0 \ libpcre2-8-0 \
libldap-2.4" && \ libldap-2.4" && \
apt-get -y update && \ apt-get -y update && \

8
Dockerfiles/proxy-mysql/ubuntu/Dockerfile
View File

@ -44,15 +44,15 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
nmap \ nmap \
ca-certificates \ ca-certificates \
fping \ fping \
libcurl4 \ libcurl4t64 \
libevent-2.1 \ libevent-2.1 \
libevent-pthreads-2.1 \ libevent-pthreads-2.1 \
libmysqlclient21 \ libmysqlclient21 \
libopenipmi0 \ libopenipmi0t64 \
libpcre2-8-0 \ libpcre2-8-0 \
libsnmp40 \ libsnmp40t64 \
libssh-4 \ libssh-4 \
libssl3 \ libssl3t64 \
libxml2 \ libxml2 \
mysql-client \ mysql-client \
snmp-mibs-downloader \ snmp-mibs-downloader \

8
Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
View File

@ -42,15 +42,15 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
nmap \ nmap \
ca-certificates \ ca-certificates \
fping \ fping \
libcurl4 \ libcurl4t64 \
libevent-2.1 \ libevent-2.1 \
libevent-pthreads-2.1 \ libevent-pthreads-2.1 \
libopenipmi0 \ libopenipmi0t64 \
libpcre2-8-0 \ libpcre2-8-0 \
libsnmp40 \ libsnmp40t64 \
libsqlite3-0 \ libsqlite3-0 \
libssh-4 \ libssh-4 \
libssl3 \ libssl3t64 \
libxml2 \ libxml2 \
snmp-mibs-downloader \ snmp-mibs-downloader \
unixodbc \ unixodbc \

8
Dockerfiles/server-mysql/ubuntu/Dockerfile
View File

@ -45,15 +45,15 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
iputils-ping \ iputils-ping \
traceroute \ traceroute \
fping \ fping \
libcurl4 \ libcurl4t64 \
libevent-2.1 \ libevent-2.1 \
libevent-pthreads-2.1 \ libevent-pthreads-2.1 \
libmysqlclient21 \ libmysqlclient21 \
libopenipmi0 \ libopenipmi0t64 \
libpcre2-8-0 \ libpcre2-8-0 \
libsnmp40 \ libsnmp40t64 \
libssh-4 \ libssh-4 \
libssl3 \ libssl3t64 \
libxml2 \ libxml2 \
mysql-client \ mysql-client \
snmp-mibs-downloader \ snmp-mibs-downloader \

8
Dockerfiles/server-pgsql/ubuntu/Dockerfile
View File

@ -48,15 +48,15 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
iputils-ping \ iputils-ping \
traceroute \ traceroute \
fping \ fping \
libcurl4 \ libcurl4t64 \
libevent-2.1 \ libevent-2.1 \
libevent-pthreads-2.1 \ libevent-pthreads-2.1 \
libopenipmi0 \ libopenipmi0t64 \
libpcre2-8-0 \ libpcre2-8-0 \
libpq5 \ libpq5 \
libsnmp40 \ libsnmp40t64 \
libssh-4 \ libssh-4 \
libssl3 \ libssl3t64 \
libxml2 \ libxml2 \
postgresql-client \ postgresql-client \
snmp-mibs-downloader \ snmp-mibs-downloader \

6
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_envvars
View File

@ -1,4 +1,4 @@
export APACHE_RUN_USER=zabbix export APACHE_RUN_USER=$(id -n -u)
export APACHE_RUN_GROUP=zabbix export APACHE_RUN_GROUP=www-data
export APACHE_PID_FILE=/tmp/apache2.pid export APACHE_PID_FILE=/tmp/apache2.pid
export APACHE_RUN_DIR=/tmp export APACHE_RUN_DIR=/tmp/apache2

6
Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_envvars
View File

@ -1,4 +1,4 @@
export APACHE_RUN_USER=zabbix export APACHE_RUN_USER=$(id -n -u)
export APACHE_RUN_GROUP=zabbix export APACHE_RUN_GROUP=www-data
export APACHE_PID_FILE=/tmp/apache2.pid export APACHE_PID_FILE=/tmp/apache2.pid
export APACHE_RUN_DIR=/tmp export APACHE_RUN_DIR=/tmp/apache2

9
Dockerfiles/web-service/ubuntu/Dockerfile
View File

@ -42,10 +42,10 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
DEBIAN_FRONTEND=noninteractive apt-get -y \ DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install \ --no-install-recommends install \
${INSTALL_TEMP_PKGS} && \ ${INSTALL_TEMP_PKGS} && \
apt-key --keyring /etc/apt/trusted.gpg.d/debian-archive-bullseye-automatic.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 && \ gpg --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 && \
apt-key --keyring /etc/apt/trusted.gpg.d/debian-archive-bullseye-security-automatic.gpg adv --keyserver keyserver.ubuntu.com --recv-keys A48449044AAD5C5D && \ gpg -o /etc/apt/keyrings/debian.gpg --export 0E98404D386FA1D9 && \
echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/debian.list && \ echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/debian.list && \
echo "deb http://deb.debian.org/debian bullseye-updates main" >> /etc/apt/sources.list.d/debian.list && \ echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian bullseye-updates main" >> /etc/apt/sources.list.d/debian.list && \
apt-get -y update && \ apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y \ DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install \ --no-install-recommends install \
@ -71,6 +71,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
DEBIAN_FRONTEND=noninteractive apt-get -y \ DEBIAN_FRONTEND=noninteractive apt-get -y \
purge \ purge \
${INSTALL_TEMP_PKGS} && \ ${INSTALL_TEMP_PKGS} && \
rm -rf ~/.gnupg && \
apt-get -y autoremove && \ apt-get -y autoremove && \
apt-get -y clean apt-get -y clean