Skip to content

CI: stabilization (rocky) #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitry-lipetsk merged 1 commit into from
Jul 16, 2026
+9 −11
Merged

CI: stabilization (rocky) #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Dockerfile--rockylinux_10.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -75,15 +75,14 @@ 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

# --------------------------------------------- base2_with_python-3
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
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile--rockylinux_8.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile--rockylinux_9.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -75,15 +75,14 @@ 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

# --------------------------------------------- base2_with_python-3
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
Expand Down