diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 59004bcb4f..3f442756f5 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux && \ tzdata \ coreutils \ iputils \ - pcre \ + pcre2 \ libcurl \ libmodbus \ libldap" && \ diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index bd45051ad4..7c6b8725e5 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux && \ tini \ tzdata \ iputils \ - pcre \ + pcre2 \ libcurl-minimal \ openssl-libs \ zlib" && \ diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index cd409c47e4..4282b4d64d 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux && \ tini \ tzdata \ iputils \ - pcre \ + pcre2 \ libcurl \ openssl-libs \ zlib" && \ diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 0f0e5f1302..7bb56be803 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -56,7 +56,7 @@ RUN set -eux && \ tzdata \ iputils \ shadow-utils \ - pcre \ + pcre2 \ libcurl" && \ curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 5323fc4bc7..b334642273 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -40,6 +40,7 @@ RUN set -eux && \ libssl1.1 \ libcurl4 \ libmodbus5 \ + libpcre2-8-0 \ libldap-2.4" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index bddb6a4434..f7862534d8 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -35,7 +35,7 @@ RUN set -eux && \ INSTALL_PKGS="tini \ tzdata \ bash \ - pcre \ + pcre2 \ coreutils \ smartmontools \ sudo \ diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index bed2837ecb..6e49f8ecae 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux && \ tini \ tzdata \ iputils \ - pcre \ + pcre2 \ libcurl-minimal \ smartmontools \ sudo \ diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile index 1ab8858063..6ce633eeaa 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux && \ tini \ tzdata \ iputils \ - pcre \ + pcre2 \ libcurl \ smartmontools \ sudo \ diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 5207ba3409..e6d0e53fc7 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -56,7 +56,7 @@ RUN set -eux && \ tzdata \ iputils \ shadow-utils \ - pcre \ + pcre2 \ smartmontools \ sudo \ libcurl" && \ diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index 0bdf393f96..950cb6ee96 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -40,6 +40,7 @@ RUN set -eux && \ sudo \ libssl1.1 \ libcurl4 \ + libpcre2-8-0 \ libldap-2.4" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 676ee598dd..28586ecda1 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -34,7 +34,7 @@ RUN set -eux && \ openipmi-dev \ openldap-dev \ openssl-dev \ - pcre-dev \ + pcre2-dev \ postgresql-dev \ openjdk8 \ gettext \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 2d79e571d7..16ef812842 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -23,7 +23,7 @@ RUN set -eux && \ automake \ bash \ gcc \ - pcre-devel \ + pcre2-devel \ libcurl-devel \ libevent-devel \ libssh-devel \ diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 4ca07f6dc9..c25d08a0c2 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -22,7 +22,7 @@ RUN set -eux && \ automake \ bash \ gcc \ - pcre-devel \ + pcre2-devel \ libcurl-devel \ libevent-devel \ libssh-devel \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index c0a60f4c63..731078fa06 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -34,7 +34,7 @@ RUN set -eux && \ automake \ bash \ gcc \ - pcre-devel \ + pcre2-devel \ libcurl-devel \ libevent-devel \ libssh-devel \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 5d4156910c..f74e3ff6eb 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -30,7 +30,7 @@ RUN set -eux && \ libldap2-dev \ libmysqlclient-dev \ libopenipmi-dev \ - libpcre3-dev \ + libpcre2-dev \ libsnmp-dev \ libsqlite3-dev \ libpq-dev \ diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index d9233a4902..2c67286c3f 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -62,6 +62,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-mysql \ --with-net-snmp \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 77964ba6ba..1c07b496d7 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -56,6 +56,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ # --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-mysql \ --with-net-snmp \ diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index d214b3a473..265ccee5c4 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -44,6 +44,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ # --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-mysql \ --with-net-snmp \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index e65e9353d1..e7f9e5d617 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -66,6 +66,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ # --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-mysql \ --with-net-snmp \ diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 501d4f3a4b..d3e54833b8 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -62,6 +62,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-mysql \ --with-net-snmp \ diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 3660db7a22..5df441edeb 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -62,6 +62,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index c7f22e92e2..0500200838 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -56,6 +56,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ # --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index 8b523a78d8..cc07b11c66 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -44,6 +44,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ # --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 31143d591d..fc744bf4a6 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -62,6 +62,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index 6f9cd904c9..9225118b07 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -60,6 +60,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index fa2e98e1b8..1a6545a4c7 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -54,6 +54,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ # --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index 777d7ea6c7..73e1777ed4 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -42,6 +42,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ # --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index 38a220b3ea..9c5beb0561 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -64,6 +64,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ # --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index 6e24eebdd9..dbda3e75d8 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -60,6 +60,7 @@ RUN set -eux && \ --with-ldap \ --with-libcurl \ --with-libmodbus \ + --with-libpcre2 \ --with-libxml2 \ --with-net-snmp \ --with-openipmi \ diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index bd41d37d65..92acda11cb 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux && \ mariadb-connector-c \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ + pcre2 \ unixodbc \ fping" && \ apk add \ diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index 7761343fd8..feacc03aa4 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux && \ OpenIPMI-libs \ openldap \ openssl-libs \ - pcre \ + pcre2 \ zlib \ unixODBC" && \ dnf -y module enable mysql && \ diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index f28a08f0f9..6af992cc70 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux && \ OpenIPMI-libs \ openldap \ openssl-libs \ - pcre \ + pcre2 \ zlib \ unixODBC" && \ microdnf -y module enable mysql && \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 50426e4fe0..4678056405 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -67,7 +67,7 @@ RUN set -eux && \ mysql-libs \ net-snmp-agent-libs \ OpenIPMI-libs \ - pcre \ + pcre2 \ unixODBC" && \ curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index 4bf9adbaf2..cd66bef2c3 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -43,7 +43,7 @@ RUN set -eux && \ libevent-2.1 \ libmysqlclient21 \ libopenipmi0 \ - libpcre3 \ + libpcre2-8-0 \ libsnmp35 \ libssh-4 \ libssl1.1 \ diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index f35823d01f..fbd268fd22 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -44,7 +44,7 @@ RUN set -eux && \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ + pcre2 \ sqlite-libs \ unixodbc" && \ apk add \ diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 2f2ec02adb..cd32e37208 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux && \ OpenIPMI-libs \ openldap \ openssl-libs \ - pcre \ + pcre2 \ zlib \ unixODBC" && \ dnf -y install epel-release && \ diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index 76cec671e9..2ea0ee1e03 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux && \ OpenIPMI-libs \ openldap \ openssl-libs \ - pcre \ + pcre2 \ zlib \ unixODBC" && \ microdnf -y install \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 32231060bd..4cb58b7a5d 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -64,7 +64,7 @@ RUN set -eux && \ libxml2 \ net-snmp-agent-libs \ OpenIPMI-libs \ - pcre \ + pcre2 \ sqlite-libs \ unixODBC" && \ curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 21946a908a..1cf2d45450 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -41,7 +41,7 @@ RUN set -eux && \ libcurl4 \ libevent-2.1 \ libopenipmi0 \ - libpcre3 \ + libpcre2-8-0 \ libsnmp35 \ libsqlite3-0 \ libssh-4 \ diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 392e4445b1..9cceb16d03 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux && \ mariadb-connector-c \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ + pcre2 \ unixodbc" && \ apk add \ --no-cache \ diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index abcee5d956..de24bcaacd 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux && \ OpenIPMI-libs \ openldap \ openssl-libs \ - pcre \ + pcre2 \ zlib \ unixODBC" && \ dnf -y module enable mysql && \ diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index aefeae0ea5..38c5ede5ee 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -51,7 +51,7 @@ RUN set -eux && \ OpenIPMI-libs \ openldap \ openssl-libs \ - pcre \ + pcre2 \ zlib \ unixODBC" && \ microdnf -y module enable mysql && \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 95c7262653..5430ca7058 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -68,7 +68,7 @@ RUN set -eux && \ mysql-libs \ net-snmp-agent-libs \ OpenIPMI-libs \ - pcre \ + pcre2 \ unixODBC" && \ curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index a54ed4f6ef..3ec4de0ee0 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux && \ libevent-2.1 \ libmysqlclient21 \ libopenipmi0 \ - libpcre3 \ + libpcre2-8-0 \ libsnmp35 \ libssh-4 \ libssl1.1 \ diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index c92b6909ca..bc2aed245a 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -47,7 +47,7 @@ RUN set -eux && \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ - pcre \ + pcre2 \ postgresql-client \ postgresql-libs \ unixodbc" && \ diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 1d4160de1c..4b615a68e1 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -49,7 +49,7 @@ RUN set -eux && \ OpenIPMI-libs \ openldap \ openssl-libs \ - pcre \ + pcre2 \ postgresql \ postgresql-libs \ zlib \ diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index 6199a8a6d2..06e1d435ff 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -49,7 +49,7 @@ RUN set -eux && \ OpenIPMI-libs \ openldap \ openssl-libs \ - pcre \ + pcre2 \ postgresql \ postgresql-libs \ zlib \ diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 60e891115f..4639337856 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux && \ libcurl4 \ libevent-2.1 \ libopenipmi0 \ - libpcre3 \ + libpcre2-8-0 \ libpq5 \ libsnmp35 \ libssh-4 \ diff --git a/Dockerfiles/zabbix-appliance/rhel/Dockerfile b/Dockerfiles/zabbix-appliance/rhel/Dockerfile index 162f45a657..a98718e7a7 100644 --- a/Dockerfiles/zabbix-appliance/rhel/Dockerfile +++ b/Dockerfiles/zabbix-appliance/rhel/Dockerfile @@ -44,7 +44,6 @@ RUN set -o xtrace && INSTALL_PKGS="OpenIPMI-libs \ curl \ fping \ java-1.8.0-openjdk-headless \ - pcre \ libcurl \ libssh \ libevent \ @@ -55,7 +54,7 @@ RUN set -o xtrace && INSTALL_PKGS="OpenIPMI-libs \ nginx \ openldap \ openssl-libs \ - pcre \ + pcre2 \ php-bcmath \ php-fpm \ php-gd \ @@ -121,7 +120,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr libxml2-devel \ make \ mariadb-connector-c-devel \ - pcre-devel \ + pcre2-devel \ net-snmp-devel \ OpenIPMI-devel \ openldap-devel \ @@ -147,6 +146,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr --with-mysql \ --with-ldap \ --with-libcurl \ + --with-libpcre2 \ --with-libxml2 \ --enable-java \ --with-net-snmp \