diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 59004bcb4..3f442756f 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 bd45051ad..7c6b8725e 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 cd409c47e..4282b4d64 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 0f0e5f130..7bb56be80 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 5323fc4bc..b33464227 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 bddb6a443..f7862534d 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 bed2837ec..6e49f8eca 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 1ab885806..6ce633eea 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 5207ba340..e6d0e53fc 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 0bdf393f9..950cb6ee9 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 676ee598d..28586ecda 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 2d79e571d..16ef81284 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 4ca07f6dc..c25d08a0c 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 c0a60f4c6..731078fa0 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 5d4156910..f74e3ff6e 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 d9233a490..2c67286c3 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 77964ba6b..1c07b496d 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 d214b3a47..265ccee5c 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 e65e9353d..e7f9e5d61 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 501d4f3a4..d3e54833b 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 3660db7a2..5df441ede 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 c7f22e92e..050020083 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 8b523a78d..cc07b11c6 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 31143d591..fc744bf4a 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 6f9cd904c..9225118b0 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 fa2e98e1b..1a6545a4c 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 777d7ea6c..73e1777ed 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 38a220b3e..9c5beb056 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 6e24eebdd..dbda3e75d 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 bd41d37d6..92acda11c 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 7761343fd..feacc03aa 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 f28a08f0f..6af992cc7 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 50426e4fe..467805640 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 4bf9adbaf..cd66bef2c 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 f35823d01..fbd268fd2 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 2f2ec02ad..cd32e3720 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 76cec671e..2ea0ee1e0 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 32231060b..4cb58b7a5 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 21946a908..1cf2d4545 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 392e4445b..9cceb16d0 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 abcee5d95..de24bcaac 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 aefeae0ea..38c5ede5e 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 95c726265..5430ca705 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 a54ed4f6e..3ec4de0ee 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 c92b6909c..bc2aed245 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 1d4160de1..4b615a68e 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 6199a8a6d..06e1d435f 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 60e891115..463933785 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 162f45a65..a98718e7a 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 \