Skip to content

Commit

Permalink
Merge pull request #1316 from zabbix/64_security
Browse files Browse the repository at this point in the history 
64 security
  • Loading branch information
@dotneft
dotneft authored Mar 24, 2024
2 parents 28ece2b + dbee23a commit 47f0323
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfiles/agent/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
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 && \
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 && \
microdnf -y install \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/agent2/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
smartmontools \
sudo \
libcurl-minimal" && \
curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
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 && \
microdnf -y install \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/build-base/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ 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 && \
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 && \
ARCH_SUFFIX="$(arch)"; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/proxy-mysql/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
pcre2 \
gzip \
unixODBC" && \
curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
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 && \
ARCH_SUFFIX="$(arch)"; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/proxy-sqlite3/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
pcre2 \
sqlite-libs \
unixODBC" && \
curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
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 && \
ARCH_SUFFIX="$(arch)"; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/server-mysql/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
pcre2 \
gzip \
unixODBC" && \
curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
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 && \
ARCH_SUFFIX="$(arch)"; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/server-pgsql/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
postgresql-libs \
gzip \
unixODBC" && \
curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
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 && \
ARCH_SUFFIX="$(arch)"; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-mysql/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
php-mbstring \
php-mysqlnd \
php-xml" && \
curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
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 && \
ARCH_SUFFIX="$(arch)"; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
--no-install-recommends install \
${INSTALL_TEMP_PKGS} && \
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME && \
curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx.gpg && \
curl --tlsv1.2 -sSf -L https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx.gpg && \
gpg --dry-run --quiet --import --import-options import-show /etc/apt/trusted.gpg.d/nginx.gpg && \
DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
echo "deb https://nginx.org/packages/ubuntu $DISTRIB_CODENAME nginx" > /etc/apt/sources.list.d/nginx.list && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
php-mbstring \
php-pgsql \
php-xml" && \
curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
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 && \
ARCH_SUFFIX="$(arch)"; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
--no-install-recommends install \
${INSTALL_TEMP_PKGS} && \
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME && \
curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx.gpg && \
curl --tlsv1.2 -sSf -L https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx.gpg && \
gpg --dry-run --quiet --import --import-options import-show /etc/apt/trusted.gpg.d/nginx.gpg && \
DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
echo "deb https://nginx.org/packages/ubuntu $DISTRIB_CODENAME nginx" > /etc/apt/sources.list.d/nginx.list && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-service/rhel/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
INSTALL_PKGS="bash \
shadow-utils \
chromium-headless" && \
curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
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 && \
ARCH_SUFFIX="$(arch)"; \
Expand Down

0 comments on commit 47f0323

Please sign in to comment.