From 3a373a6546d150f026d4feff783005fad29b5a64 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 24 Apr 2024 18:56:11 +0900 Subject: [PATCH] Updated Ubuntu to 24.04 --- Dockerfiles/agent/ubuntu/Dockerfile | 4 ++-- Dockerfiles/agent2/ubuntu/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 8 ++++---- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 9 +++++---- Dockerfiles/server-mysql/ubuntu/Dockerfile | 8 ++++---- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 9 +++++---- .../ubuntu/conf/etc/zabbix/apache_envvars | 6 +++--- .../ubuntu/conf/etc/zabbix/apache_envvars | 6 +++--- Dockerfiles/web-service/ubuntu/Dockerfile | 9 +++++---- 9 files changed, 33 insertions(+), 30 deletions(-) diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index e1e2e1eab..d3f618bba 100644 --- 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 index 3953ee40c..29fe89824 100644 --- 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 index 9a0cdea6a..56551ad22 100644 --- 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 index 644de9f5a..a17b7c42e 100644 --- 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 index 398b2c835..16e71a970 100644 --- 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 index 98527ad8a..56c924df5 100644 --- 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 index 54a63c8c9..7826620ba 100644 --- 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 index 54a63c8c9..7826620ba 100644 --- 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 index 945b70729..e00b1ff62 100644 --- 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