Merge pull request #1319 from zabbix/zlib_64

Added zlib and devel packages
zabbix · Mar 24, 2024 · c0d9f58 · c0d9f58
2 parents 47f0323 + 876a2c1
commit c0d9f58
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 20 deletions.
diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile
@@ -41,7 +41,8 @@ RUN set -eux && \
             libgcc \
             libcurl \
             libmodbus \
-            libldap" && \
+            libldap \
+            zlib" && \
     apk add \
             --no-cache \
             --clean-protected \

diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile
@@ -58,7 +58,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             shadow-utils \
             pcre2 \
             libmodbus \
-            libcurl-minimal" && \
+            libcurl-minimal \
+            zlib" && \
     curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
     rm -rf /tmp/epel-release-latest-9.noarch.rpm && \

diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile
@@ -42,7 +42,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             libcurl4 \
             libmodbus5 \
             libpcre2-8-0 \
-            libldap-2.4" && \
+            libldap-2.4 \
+            zlib1g" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \

diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile
@@ -57,7 +57,8 @@ RUN set -eux && \
             go \
             make \
             $openjdk_packages \
-            unixodbc-dev" && \
+            unixodbc-dev \
+            zlib-dev" && \
     apk add \
             --no-cache \
             --clean-protected \

diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile
@@ -44,7 +44,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             git \
             gettext \
             go-toolset \
-            unixODBC-devel" && \
+            unixODBC-devel \
+            zlib-devel" && \
     microdnf -y install \
         --disablerepo "*" \
         --enablerepo "extras-common" \

diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile
@@ -45,7 +45,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             java-17-openjdk-devel \
             git \
             gettext \
-            unixODBC-devel" && \
+            unixODBC-devel \
+            zlib-devel" && \
     microdnf -y install \
         --disablerepo "*" \
         --enablerepo "ol9_baseos_latest" \

diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile
@@ -56,7 +56,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             java-17-openjdk-devel \
             git \
             gettext \
-            unixODBC-devel" && \
+            unixODBC-devel \
+            zlib-devel" && \
     curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
     rm -rf /tmp/epel-release-latest-9.noarch.rpm && \

diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile
@@ -46,7 +46,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             git \
             golang-1.21 \
             unzip \
-            unixodbc-dev" && \
+            unixodbc-dev \
+            zlib1g-dev" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \

diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile
@@ -54,7 +54,8 @@ RUN set -eux && \
             pcre2 \
             unixodbc \
             gzip \
-            fping" && \
+            fping \
+            zlib" && \
     apk add \
             --no-cache \
             --clean-protected \

diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile
@@ -74,7 +74,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             OpenIPMI-libs \
             pcre2 \
             gzip \
-            unixODBC" && \
+            unixODBC \
+            zlib" && \
     curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
     rm -rf /tmp/epel-release-latest-9.noarch.rpm && \

diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@@ -58,7 +58,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             mysql-client \
             snmp-mibs-downloader \
             gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib1g" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \

diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
@@ -51,7 +51,8 @@ RUN set -eux && \
             openipmi-libs \
             pcre2 \
             sqlite-libs \
-            unixodbc" && \
+            unixodbc \
+            zlib" && \
     apk add \
             --no-cache \
             --clean-protected \

diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
@@ -71,7 +71,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             OpenIPMI-libs \
             pcre2 \
             sqlite-libs \
-            unixODBC" && \
+            unixODBC \
+            zlib" && \
     curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
     rm -rf /tmp/epel-release-latest-9.noarch.rpm && \

diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
@@ -54,7 +54,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             libssl3 \
             libxml2 \
             snmp-mibs-downloader \
-            unixodbc" && \
+            unixodbc \
+            zlib1g" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \

diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile
@@ -54,7 +54,8 @@ RUN set -eux && \
             openipmi-libs \
             pcre2 \
             gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib" && \
     apk add \
             --no-cache \
             --clean-protected \

diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile
@@ -77,7 +77,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             OpenIPMI-libs \
             pcre2 \
             gzip \
-            unixODBC" && \
+            unixODBC \
+            zlib" && \
     curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
     rm -rf /tmp/epel-release-latest-9.noarch.rpm && \

diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile
@@ -59,7 +59,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             mysql-client \
             snmp-mibs-downloader \
             gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib1g" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \

diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile
@@ -57,7 +57,8 @@ RUN set -eux && \
             postgresql-client \
             postgresql-libs \
             gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib" && \
     apk add \
             --no-cache \
             --clean-protected \

diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile
@@ -79,7 +79,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             postgresql \
             postgresql-libs \
             gzip \
-            unixODBC" && \
+            unixODBC \
+            zlib1g" && \
     curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
     rm -rf /tmp/epel-release-latest-9.noarch.rpm && \

diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
@@ -62,7 +62,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
             postgresql-client \
             snmp-mibs-downloader \
             gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib1g" && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y \
             --no-install-recommends install \