Merge pull request #1261 from zabbix/60_modbus

Added modbus support for RHEL like systems

Dockerfiles/agent/centos/Dockerfile

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

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" && \
     curl --tlsv1.2 -sSf -L -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 && \

Dockerfiles/build-base/centos/Dockerfile

@@ -19,7 +19,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
-    REPOLIST="baseos,appstream,powertools" && \
+    REPOLIST="baseos,appstream,powertools,epel" && \
     INSTALL_PKGS="autoconf \
             automake \
             bash \
@@ -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 \
@@ -45,6 +46,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             go-toolset \
             unixODBC-devel" && \
     dnf -y module enable mysql && \
+    dnf -y install \
+        --disablerepo "*" \
+        --enablerepo "extras" \
+        --setopt=tsflags=nodocs \
+        --setopt=install_weak_deps=False \
+        --best epel-release && \
     dnf -y install \
         --disablerepo "*" \
         --enablerepo "${REPOLIST}" \

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-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.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 \
@@ -50,6 +53,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --enablerepo "ol8_baseos_latest" \
         --enablerepo "ol8_appstream" \
         --enablerepo "ol8_codeready_builder" \
+        --enablerepo="ol8_developer_EPEL" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
         --best \

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-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
+    rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \
+    rm -rf /tmp/epel-release-latest-8.noarch.rpm && \
     microdnf -y module enable mysql && \
     microdnf -y install \
             --disablerepo "*" \
@@ -63,6 +67,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             --enablerepo "rhel-8-for-x86_64-baseos-rpms" \
             --enablerepo "rhel-8-for-x86_64-appstream-rpms" \
             --enablerepo "codeready-builder-for-rhel-8-x86_64-rpms" \
+            --enablerepo "epel" \
             --setopt=install_weak_deps=0 \
             --setopt=keepcache=0 \
             --best \

Dockerfiles/build-mysql/centos/Dockerfile

@@ -50,8 +50,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
             --enable-webservice \
             --with-ldap \
             --with-libcurl \
-#            Not available for CentOS 8
+            --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 \