From b6a46be4b2f08deff3a48171dea707f5d121489b Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sun, 24 Mar 2024 22:42:53 +0900 Subject: [PATCH] Added zlib and devel packages --- Dockerfiles/agent/alpine/Dockerfile | 3 ++- Dockerfiles/agent/rhel/Dockerfile | 3 ++- Dockerfiles/agent/ubuntu/Dockerfile | 3 ++- Dockerfiles/build-base/alpine/Dockerfile | 3 ++- Dockerfiles/build-base/centos/Dockerfile | 3 ++- Dockerfiles/build-base/ol/Dockerfile | 3 ++- Dockerfiles/build-base/rhel/Dockerfile | 3 ++- Dockerfiles/build-base/ubuntu/Dockerfile | 3 ++- Dockerfiles/proxy-mysql/alpine/Dockerfile | 3 ++- Dockerfiles/proxy-mysql/rhel/Dockerfile | 3 ++- Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 3 ++- Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 3 ++- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 3 ++- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 3 ++- Dockerfiles/server-mysql/alpine/Dockerfile | 3 ++- Dockerfiles/server-mysql/rhel/Dockerfile | 3 ++- Dockerfiles/server-mysql/ubuntu/Dockerfile | 3 ++- Dockerfiles/server-pgsql/alpine/Dockerfile | 3 ++- Dockerfiles/server-pgsql/rhel/Dockerfile | 3 ++- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 3 ++- 20 files changed, 40 insertions(+), 20 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index aaed696e0..700484fbb 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -40,7 +40,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 index af5ea5d69..a07624865 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -57,7 +57,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 index 369c11aeb..85717962a 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -41,7 +41,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 index dfd8c222a..786a6119a 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -51,7 +51,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 index 7c6cf7117..2f43acd28 100644 --- 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 index ecae34542..6ac345593 100644 --- 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 index 7cf9dd769..c275ec11c 100644 --- 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 index af796447d..1429da09f 100644 --- 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 index bd44c297e..374277362 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -53,7 +53,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 index c15818e35..1656febd9 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -73,7 +73,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 index 6383b7a98..792099626 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -57,7 +57,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 index d58c0d77d..da3ac0053 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -50,7 +50,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 index 1088d5f30..ec4aa8f35 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -70,7 +70,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 index 3e9c16d14..ce21d1492 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -53,7 +53,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 index a4d6b26df..ca70ef974 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -53,7 +53,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 index e3cde18bc..2bdfe3738 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -76,7 +76,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 index 6db8b868d..97cbcdc2d 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-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/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index d3534b0d3..72b8c0494 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -56,7 +56,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 index 530a0f933..8ce34f094 100644 --- 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 index 97758ec79..5a16bbcef 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -61,7 +61,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 \