From 4d9459727e8d3144df48abebe9aa129071ca08fa Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Thu, 16 Jul 2026 00:42:31 +0300 Subject: [PATCH] CI: stabilization (rocky) They use options "--setopt=retries=10 --setopt=max_parallel_downloads=10" --- Dockerfile--rockylinux_10.tmpl | 7 +++---- Dockerfile--rockylinux_8.tmpl | 6 +++--- Dockerfile--rockylinux_9.tmpl | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Dockerfile--rockylinux_10.tmpl b/Dockerfile--rockylinux_10.tmpl index 718e8021..a94d901f 100644 --- a/Dockerfile--rockylinux_10.tmpl +++ b/Dockerfile--rockylinux_10.tmpl @@ -13,7 +13,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \ # Consolidating system utilities, including iproute (to prevent tests from failing) # Added the --allowerasing flag so dnf can seamlessly replace curl-minimal with full-fledged curl -RUN dnf install -y --allowerasing \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \ sudo \ curl \ ca-certificates \ @@ -39,7 +39,7 @@ RUN sed -i 's/#MaxStartups 10:30:100/MaxStartups 2000:30:2000/' /etc/ssh/sshd_co # --------------------------------------------- postgres dev tools FROM base1 AS base1_with_dev_tools -RUN dnf install -y \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \ gcc \ make \ meson \ @@ -75,7 +75,6 @@ RUN make -j 4 -C contrib install RUN ln -s /pg/postgres/install/bin/pg_config -t /usr/local/bin # SETUP PG CLIENT LIBRARY -# ИСПРАВЛЕНО: ссылаемся на базовое имя libpq.so.5, чтобы Dockerfile не ломался при обновлении минорных версий PG RUN ln -s /pg/postgres/install/lib/libpq.so.5 /usr/lib64/libpq.so.5 && \ echo "/pg/postgres/install/lib" > /etc/ld.so.conf.d/postgres.conf && ldconfig @@ -83,7 +82,7 @@ RUN ln -s /pg/postgres/install/lib/libpq.so.5 /usr/lib64/libpq.so.5 && \ FROM base1_with_pg-${PG_VERSION} AS base2_with_python-3 # Rocky 9/10 installs python3.9 or higher (depending on the repository) -RUN dnf install -y \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \ python3 \ python3-devel \ && dnf clean all diff --git a/Dockerfile--rockylinux_8.tmpl b/Dockerfile--rockylinux_8.tmpl index 1e818154..d9432ddc 100644 --- a/Dockerfile--rockylinux_8.tmpl +++ b/Dockerfile--rockylinux_8.tmpl @@ -10,7 +10,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \ dnf config-manager --set-enabled powertools # Combine the installation of system utilities, SSH into one layer -RUN dnf install -y \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 \ sudo \ curl \ ca-certificates \ @@ -32,7 +32,7 @@ RUN sed -i 's/#MaxStartups 10:30:100/MaxStartups 2000:30:2000/' /etc/ssh/sshd_co # --------------------------------------------- postgres dev tools FROM base1 AS base1_with_dev_tools -RUN dnf install -y \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 \ gcc \ make \ meson \ @@ -72,7 +72,7 @@ RUN ln -s /pg/postgres/install/lib/libpq.so.5 /usr/lib/libpq.so.5 # --------------------------------------------- base2_with_python-3 FROM base1_with_pg-${PG_VERSION} AS base2_with_python-3 -RUN dnf install -y \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 \ python39 \ python39-devel \ && dnf clean all diff --git a/Dockerfile--rockylinux_9.tmpl b/Dockerfile--rockylinux_9.tmpl index 26c9b781..ec7b9f16 100644 --- a/Dockerfile--rockylinux_9.tmpl +++ b/Dockerfile--rockylinux_9.tmpl @@ -13,7 +13,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \ # Consolidating system utilities, including iproute (to prevent tests from failing) # Added the --allowerasing flag so dnf can seamlessly replace curl-minimal with full-fledged curl -RUN dnf install -y --allowerasing \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \ sudo \ curl \ ca-certificates \ @@ -39,7 +39,7 @@ RUN sed -i 's/#MaxStartups 10:30:100/MaxStartups 2000:30:2000/' /etc/ssh/sshd_co # --------------------------------------------- postgres dev tools FROM base1 AS base1_with_dev_tools -RUN dnf install -y \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \ gcc \ make \ meson \ @@ -75,7 +75,6 @@ RUN make -j 4 -C contrib install RUN ln -s /pg/postgres/install/bin/pg_config -t /usr/local/bin # SETUP PG CLIENT LIBRARY -# ИСПРАВЛЕНО: ссылаемся на базовое имя libpq.so.5, чтобы Dockerfile не ломался при обновлении минорных версий PG RUN ln -s /pg/postgres/install/lib/libpq.so.5 /usr/lib64/libpq.so.5 && \ echo "/pg/postgres/install/lib" > /etc/ld.so.conf.d/postgres.conf && ldconfig @@ -83,7 +82,7 @@ RUN ln -s /pg/postgres/install/lib/libpq.so.5 /usr/lib64/libpq.so.5 && \ FROM base1_with_pg-${PG_VERSION} AS base2_with_python-3 # Rocky 9/10 installs python3.9 or higher (depending on the repository) -RUN dnf install -y \ +RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \ python3 \ python3-devel \ && dnf clean all