Updated Ubuntu to 24.04

zabbix · Dec 6, 2024 · 3a373a6 · 3a373a6
1 parent 7d95993
commit 3a373a6
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 30 deletions.
diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile
@@ -37,8 +37,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             tini \
             tzdata \
             ca-certificates \
-            libssl3 \
-            libcurl4 \
+            libssl3t64 \
+            libcurl4t64 \
             libmodbus5 \
             libpcre2-8-0 \
             libldap-2.4 \

diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile
@@ -38,8 +38,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             ca-certificates \
             smartmontools \
             sudo \
-            libssl3 \
-            libcurl4 \
+            libssl3t64 \
+            libcurl4t64 \
             libpcre2-8-0 \
             libldap-2.4" && \
     apt-get -y update && \

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

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

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

diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
@@ -45,14 +45,15 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             iputils-ping \
             traceroute \
             fping \
-            libcurl4 \
+            libcurl4t64 \
             libevent-2.1 \
-            libopenipmi0 \
+            libevent-pthreads-2.1 \
+            libopenipmi0t64 \
             libpcre2-8-0 \
             libpq5 \
-            libsnmp40 \
+            libsnmp40t64 \
             libssh-4 \
-            libssl3 \
+            libssl3t64 \
             libxml2 \
             postgresql-client \
             snmp-mibs-downloader \

diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_envvars b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_envvars
@@ -1,4 +1,4 @@
-export APACHE_RUN_USER=zabbix
-export APACHE_RUN_GROUP=zabbix
+export APACHE_RUN_USER=$(id -n -u)
+export APACHE_RUN_GROUP=www-data
 export APACHE_PID_FILE=/tmp/apache2.pid
-export APACHE_RUN_DIR=/tmp
+export APACHE_RUN_DIR=/tmp/apache2
diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_envvars b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_envvars
@@ -1,4 +1,4 @@
-export APACHE_RUN_USER=zabbix
-export APACHE_RUN_GROUP=zabbix
+export APACHE_RUN_USER=$(id -n -u)
+export APACHE_RUN_GROUP=www-data
 export APACHE_PID_FILE=/tmp/apache2.pid
-export APACHE_RUN_DIR=/tmp
+export APACHE_RUN_DIR=/tmp/apache2
diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile
@@ -42,10 +42,10 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \
         ${INSTALL_TEMP_PKGS} && \
-    apt-key --keyring /etc/apt/trusted.gpg.d/debian-archive-bullseye-automatic.gpg adv --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 && \
-    echo "deb 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 && \
+    gpg --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 && \
+    gpg -o /etc/apt/keyrings/debian.gpg --export 0E98404D386FA1D9 && \
+    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 [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 && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \
@@ -72,6 +72,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             purge \
         ${INSTALL_TEMP_PKGS} && \
+    rm -rf ~/.gnupg && \
     apt-get -y autoremove && \
     apt-get -y clean