Merge pull request #1318 from zabbix/zlib_60

Zlib 60
This commit is contained in:
Alexey Pustovalov 2024-03-24 23:13:50 +09:00 committed by GitHub
commit f0455682e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 50 additions and 31 deletions

View File

@ -41,7 +41,8 @@ RUN set -eux && \
libgcc \
libcurl \
libmodbus \
libldap" && \
libldap \
zlib" && \
apk add \
--no-cache \
--clean-protected \

View File

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

View File

@ -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 \

View File

@ -57,7 +57,8 @@ RUN set -eux && \
go \
make \
$openjdk_packages \
unixodbc-dev" && \
unixodbc-dev \
zlib-dev" && \
apk add \
--no-cache \
--clean-protected \

View File

@ -44,7 +44,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
git \
gettext \
go-toolset \
unixODBC-devel" && \
unixODBC-devel \
zlib-devel" && \
dnf -y module enable mysql && \
dnf -y install \
--disablerepo "*" \

View File

@ -45,9 +45,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
java-17-openjdk-devel \
git \
gettext \
unixODBC-devel" && \
unixODBC-devel \
zlib-devel" && \
microdnf -y module enable mysql && \
microdnf module enable postgresql:13 && \
microdnf module enable postgresql:15 && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ol8_baseos_latest" \

View File

@ -55,7 +55,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-8.noarch.rpm -o /tmp/epel-release-latest-8.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \
rm -rf /tmp/epel-release-latest-8.noarch.rpm && \

View File

@ -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 \

View File

@ -54,7 +54,8 @@ RUN set -eux && \
pcre2 \
unixodbc \
gzip \
fping" && \
fping \
zlib" && \
apk add \
--no-cache \
--clean-protected \

View File

@ -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-8.noarch.rpm -o /tmp/epel-release-latest-8.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \
rm -rf /tmp/epel-release-latest-8.noarch.rpm && \

View File

@ -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 \

View File

@ -51,7 +51,8 @@ RUN set -eux && \
openipmi-libs \
pcre2 \
sqlite-libs \
unixodbc" && \
unixodbc \
zlib" && \
apk add \
--no-cache \
--clean-protected \

View File

@ -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-8.noarch.rpm -o /tmp/epel-release-latest-8.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \
rm -rf /tmp/epel-release-latest-8.noarch.rpm && \

View File

@ -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 \

View File

@ -54,7 +54,8 @@ RUN set -eux && \
openipmi-libs \
pcre2 \
gzip \
unixodbc" && \
unixodbc \
zlib" && \
apk add \
--no-cache \
--clean-protected \

View File

@ -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-8.noarch.rpm -o /tmp/epel-release-latest-8.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \
rm -rf /tmp/epel-release-latest-8.noarch.rpm && \

View File

@ -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 \

View File

@ -55,7 +55,8 @@ RUN set -eux && \
postgresql-client \
postgresql-libs \
gzip \
unixodbc" && \
unixodbc \
zlib" && \
apk add \
--no-cache \
--clean-protected \

View File

@ -58,7 +58,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
postgresql-libs \
zlib \
unixODBC" && \
microdnf module enable postgresql:13 && \
microdnf module enable postgresql:15 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

View File

@ -59,7 +59,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 \

View File

@ -51,7 +51,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable mysql && \
dnf -y module enable php:7.4 && \
dnf -y module enable php:8.0 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

View File

@ -50,7 +50,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
glibc-locale-source \
supervisor" && \
microdnf -y module enable mysql && \
microdnf -y module enable php:7.4 && \
microdnf -y module enable php:8.0 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

View File

@ -50,7 +50,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
glibc-locale-source \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable php:7.4 && \
dnf -y module enable php:8.0 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

View File

@ -49,8 +49,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
findutils \
glibc-locale-source \
supervisor" && \
microdnf -y module enable php:7.4 && \
microdnf module enable postgresql:13 && \
microdnf -y module enable php:8.0 && \
microdnf module enable postgresql:15 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

View File

@ -49,7 +49,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable mysql && \
dnf -y module enable php:8.0 nginx:1.20 && \
dnf -y module enable php:8.0 nginx:1.22 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

View File

@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
glibc-locale-source \
supervisor" && \
microdnf -y module enable mysql && \
microdnf -y module enable php:7.4 && \
microdnf -y module enable php:8.0 nginx:1.22 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \

View File

@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
postgresql \
supervisor" && \
dnf -y install epel-release && \
dnf -y module enable php:8.0 nginx:1.20 && \
dnf -y module enable php:8.0 nginx:1.22 && \
dnf -y install \
--disablerepo "*" \
--enablerepo "${REPOLIST}" \

View File

@ -47,8 +47,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
php-xml \
postgresql \
supervisor" && \
microdnf -y module enable php:7.4 && \
microdnf module enable postgresql:13 && \
microdnf -y module enable php:8.0 nginx:1.22 && \
microdnf module enable postgresql:15 && \
microdnf -y install \
--disablerepo="*" \
--enablerepo="ol8_baseos_latest" \