Merge pull request #1256 from zabbix/modbus_64

Modbus 64

Dockerfiles/agent/centos/Dockerfile

@@ -39,6 +39,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             iputils \
             pcre2 \
             libcurl-minimal \
+            libmodbus \
             openssl-libs \
             shadow-utils \
             zlib" && \

Dockerfiles/agent/ol/Dockerfile

@@ -40,6 +40,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             iputils \
             pcre2 \
             libcurl \
+            libmodbus \
             openssl-libs \
             zlib" && \
     microdnf -y install \

Dockerfiles/agent/rhel/Dockerfile

@@ -58,6 +58,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             iputils \
             shadow-utils \
             pcre2 \
+            libmodbus \
             libcurl-minimal" && \
     curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \

Dockerfiles/agent2/centos/Dockerfile

@@ -44,6 +44,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             iputils \
             pcre2 \
             libcurl-minimal \
+            libmodbus \
             smartmontools \
             shadow-utils \
             sudo \

Dockerfiles/agent2/ol/Dockerfile

@@ -45,6 +45,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             iputils \
             pcre2 \
             libcurl \
+            libmodbus \
             smartmontools \
             sudo \
             openssl-libs" && \

Dockerfiles/agent2/rhel/Dockerfile

@@ -65,6 +65,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             pcre2 \
             smartmontools \
             sudo \
+            libmodbus \
             libcurl-minimal" && \
     curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \

Dockerfiles/build-base/centos/Dockerfile

@@ -29,6 +29,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libcurl-devel \
             libevent-devel \
             libssh-devel \
+            libmodbus-devel \
             libxml2-devel \
             openssl-devel \
             openldap-devel \

Dockerfiles/build-base/ol/Dockerfile

@@ -17,6 +17,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
       org.opencontainers.image.vendor="Zabbix LLC" \
       org.opencontainers.image.version="${ZBX_VERSION}"
 
+COPY ["conf/etc/yum.repos.d/oracle-epel-ol9.repo", "/etc/yum.repos.d/oracle-epel-ol9.repo"]
+
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
     INSTALL_PKGS="autoconf \
@@ -29,6 +31,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libcurl-devel \
             libevent-devel \
             libssh-devel \
+            libmodbus-devel \
             libxml2-devel \
             openssl-devel \
             openldap-devel \
@@ -48,6 +51,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --enablerepo "ol9_baseos_latest" \
         --enablerepo "ol9_appstream" \
         --enablerepo "ol9_codeready_builder" \
+        --enablerepo="ol9_developer_EPEL" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
         --best \

Dockerfiles/build-base/ol/conf/etc/yum.repos.d/oracle-epel-ol9.repo

@@ -0,0 +1,6 @@
+[ol9_developer_EPEL]
+name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
+baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/developer/EPEL/$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0

Dockerfiles/build-base/rhel/Dockerfile

@@ -41,6 +41,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libcurl-devel \
             libevent-devel \
             libssh-devel \
+            libmodbus-devel \
             libxml2-devel \
             openssl-devel \
             openldap-devel \
@@ -55,6 +56,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             git \
             gettext \
             unixODBC-devel" && \
+    curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+    rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
+    rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
     ARCH_SUFFIX="$(arch)"; \
     microdnf -y install \
             --disablerepo "*" \
@@ -63,6 +67,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
             --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
             --enablerepo "codeready-builder-for-rhel-9-$ARCH_SUFFIX-rpms" \
+            --enablerepo "epel" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \

Dockerfiles/build-mysql/centos/Dockerfile

@@ -50,7 +50,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \

Dockerfiles/build-mysql/ol/Dockerfile

@@ -51,7 +51,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \

Dockerfiles/build-mysql/rhel/Dockerfile

@@ -60,7 +60,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-mysql \

Dockerfiles/build-pgsql/centos/Dockerfile

@@ -50,7 +50,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \

Dockerfiles/build-pgsql/ol/Dockerfile

@@ -51,7 +51,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \

Dockerfiles/build-sqlite3/centos/Dockerfile

@@ -46,7 +46,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-proxy \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \

Dockerfiles/build-sqlite3/ol/Dockerfile

@@ -47,7 +47,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-proxy \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \

Dockerfiles/build-sqlite3/rhel/Dockerfile

@@ -56,7 +56,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-proxy \
             --with-ldap \
             --with-libcurl \
-#            --with-libmodbus \
+            --with-libmodbus \
             --with-libpcre2 \
             --with-libxml2 \
             --with-net-snmp \