Skip to content

Commit a0a8572

Browse files
CI: stabilization (rocky) (#409)
They use options "--setopt=retries=10 --setopt=max_parallel_downloads=10"
1 parent b4d624f commit a0a8572

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

Dockerfile--rockylinux_10.tmpl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \
1313

1414
# Consolidating system utilities, including iproute (to prevent tests from failing)
1515
# Added the --allowerasing flag so dnf can seamlessly replace curl-minimal with full-fledged curl
16-
RUN dnf install -y --allowerasing \
16+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \
1717
sudo \
1818
curl \
1919
ca-certificates \
@@ -39,7 +39,7 @@ RUN sed -i 's/#MaxStartups 10:30:100/MaxStartups 2000:30:2000/' /etc/ssh/sshd_co
3939
# --------------------------------------------- postgres dev tools
4040
FROM base1 AS base1_with_dev_tools
4141

42-
RUN dnf install -y \
42+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \
4343
gcc \
4444
make \
4545
meson \
@@ -75,15 +75,14 @@ RUN make -j 4 -C contrib install
7575
RUN ln -s /pg/postgres/install/bin/pg_config -t /usr/local/bin
7676

7777
# SETUP PG CLIENT LIBRARY
78-
# ИСПРАВЛЕНО: ссылаемся на базовое имя libpq.so.5, чтобы Dockerfile не ломался при обновлении минорных версий PG
7978
RUN ln -s /pg/postgres/install/lib/libpq.so.5 /usr/lib64/libpq.so.5 && \
8079
echo "/pg/postgres/install/lib" > /etc/ld.so.conf.d/postgres.conf && ldconfig
8180

8281
# --------------------------------------------- base2_with_python-3
8382
FROM base1_with_pg-${PG_VERSION} AS base2_with_python-3
8483

8584
# Rocky 9/10 installs python3.9 or higher (depending on the repository)
86-
RUN dnf install -y \
85+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \
8786
python3 \
8887
python3-devel \
8988
&& dnf clean all

Dockerfile--rockylinux_8.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \
1010
dnf config-manager --set-enabled powertools
1111

1212
# Combine the installation of system utilities, SSH into one layer
13-
RUN dnf install -y \
13+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 \
1414
sudo \
1515
curl \
1616
ca-certificates \
@@ -32,7 +32,7 @@ RUN sed -i 's/#MaxStartups 10:30:100/MaxStartups 2000:30:2000/' /etc/ssh/sshd_co
3232
# --------------------------------------------- postgres dev tools
3333
FROM base1 AS base1_with_dev_tools
3434

35-
RUN dnf install -y \
35+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 \
3636
gcc \
3737
make \
3838
meson \
@@ -72,7 +72,7 @@ RUN ln -s /pg/postgres/install/lib/libpq.so.5 /usr/lib/libpq.so.5
7272
# --------------------------------------------- base2_with_python-3
7373
FROM base1_with_pg-${PG_VERSION} AS base2_with_python-3
7474

75-
RUN dnf install -y \
75+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 \
7676
python39 \
7777
python39-devel \
7878
&& dnf clean all

Dockerfile--rockylinux_9.tmpl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \
1313

1414
# Consolidating system utilities, including iproute (to prevent tests from failing)
1515
# Added the --allowerasing flag so dnf can seamlessly replace curl-minimal with full-fledged curl
16-
RUN dnf install -y --allowerasing \
16+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \
1717
sudo \
1818
curl \
1919
ca-certificates \
@@ -39,7 +39,7 @@ RUN sed -i 's/#MaxStartups 10:30:100/MaxStartups 2000:30:2000/' /etc/ssh/sshd_co
3939
# --------------------------------------------- postgres dev tools
4040
FROM base1 AS base1_with_dev_tools
4141

42-
RUN dnf install -y \
42+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \
4343
gcc \
4444
make \
4545
meson \
@@ -75,15 +75,14 @@ RUN make -j 4 -C contrib install
7575
RUN ln -s /pg/postgres/install/bin/pg_config -t /usr/local/bin
7676

7777
# SETUP PG CLIENT LIBRARY
78-
# ИСПРАВЛЕНО: ссылаемся на базовое имя libpq.so.5, чтобы Dockerfile не ломался при обновлении минорных версий PG
7978
RUN ln -s /pg/postgres/install/lib/libpq.so.5 /usr/lib64/libpq.so.5 && \
8079
echo "/pg/postgres/install/lib" > /etc/ld.so.conf.d/postgres.conf && ldconfig
8180

8281
# --------------------------------------------- base2_with_python-3
8382
FROM base1_with_pg-${PG_VERSION} AS base2_with_python-3
8483

8584
# Rocky 9/10 installs python3.9 or higher (depending on the repository)
86-
RUN dnf install -y \
85+
RUN dnf install -y --setopt=retries=10 --setopt=max_parallel_downloads=10 --allowerasing \
8786
python3 \
8887
python3-devel \
8988
&& dnf clean all

0 commit comments

Comments
 (0)