Skip to content

[CI] Dockerfiles are updated (cleanup) #327

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 7 commits into from
Jan 23, 2026
Merged

[CI] Dockerfiles are updated (cleanup) #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
772e3aa
[CI] run_tests.sh uses "pythonX -m venv ..."
dmitry-lipetsk Jan 23, 2026
bf0fdb4
[CI] altlinux does not install python virtualenv
dmitry-lipetsk Jan 23, 2026
8e49971
[CI] ubuntu 24_04 does not install python3-virtualenv
dmitry-lipetsk Jan 23, 2026
c8592cb
[CI] std/std-all do not install py-virtualenv
dmitry-lipetsk Jan 23, 2026
26fa916
[CI] altlinux dockerfiles are updated (cleanup)
dmitry-lipetsk Jan 23, 2026
83939ac
[CI] fix: ubuntu 24.04 requires python3-venv and build-essential
dmitry-lipetsk Jan 23, 2026
0610303
[CI] run_tests.sh sets VIRTUAL_ENV_DISABLE_PROMPT=1 (restored)
dmitry-lipetsk Jan 23, 2026
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
13 changes: 0 additions & 13 deletions Dockerfile--altlinux_10.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,8 @@ RUN ln -s /pg/postgres/install/lib/libpq.so.5.17 /usr/lib64/libpq.so.5
FROM base1_with_pg-${PG_VERSION} as base2_with_python-3
RUN apt-get install -y python3
RUN apt-get install -y python3-dev
RUN apt-get install -y python3-module-virtualenv
RUN apt-get install -y python3-modules-sqlite3

# AltLinux does not have "generic" virtualenv utility. Let's create it.
RUN if [[ -f "/usr/bin/virtualenv" ]] ; then \
echo AAA; \
elif [[ -f "/usr/bin/virtualenv3" ]] ; then \
ln -s /usr/bin/virtualenv3 /usr/bin/virtualenv; \
else \
echo "/usr/bin/virtualenv is not created!"; \
exit 1; \
fi

ENV PYTHON_VERSION=3

# --------------------------------------------- final
Expand All @@ -101,8 +90,6 @@ RUN mkdir -p ~/.ssh
#
# Altlinux 10 and 11 too slowly create a new SSH connection (x6).
#
# So, we exclude the "remote" tests until this problem has been resolved.
#

ENTRYPOINT sh -c " \
set -eux; \
Expand Down
13 changes: 0 additions & 13 deletions Dockerfile--altlinux_11.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,8 @@ RUN ln -s /pg/postgres/install/lib/libpq.so.5.17 /usr/lib64/libpq.so.5
FROM base1_with_pg-${PG_VERSION} as base2_with_python-3
RUN apt-get install -y python3
RUN apt-get install -y python3-dev
RUN apt-get install -y python3-module-virtualenv
RUN apt-get install -y python3-modules-sqlite3

# AltLinux does not have "generic" virtualenv utility. Let's create it.
RUN if [[ -f "/usr/bin/virtualenv" ]] ; then \
echo AAA; \
elif [[ -f "/usr/bin/virtualenv3" ]] ; then \
ln -s /usr/bin/virtualenv3 /usr/bin/virtualenv; \
else \
echo "/usr/bin/virtualenv is not created!"; \
exit 1; \
fi

ENV PYTHON_VERSION=3

# --------------------------------------------- final
Expand All @@ -104,8 +93,6 @@ RUN mkdir -p ~/.ssh
#
# Altlinux 10 and 11 too slowly create a new SSH connection (x6).
#
# So, we exclude the "remote" tests until this problem has been resolved.
#

ENTRYPOINT sh -c " \
set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile--std-all.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM postgres:${PG_VERSION}-alpine as base1

# --------------------------------------------- base2_with_python-3
FROM base1 as base2_with_python-3
RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers py-virtualenv
RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers
ENV PYTHON_VERSION=3

# --------------------------------------------- final
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile--std.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM postgres:${PG_VERSION}-alpine as base1

# --------------------------------------------- base2_with_python-3
FROM base1 as base2_with_python-3
RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers py-virtualenv
RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers
ENV PYTHON_VERSION=3

# --------------------------------------------- final
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile--ubuntu_24_04.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN sh -c "echo postgres ALL=NOPASSWD:/usr/sbin/service ssh start" >> /etc/sudoe

# --------------------------------------------- base2_with_python-3
FROM base1 as base2_with_python-3
RUN apt install -y python3 python3-dev python3-virtualenv libpq-dev
RUN apt install -y python3 python3-dev python3-venv libpq-dev build-essential
ENV PYTHON_VERSION=3

# --------------------------------------------- final
Expand Down
2 changes: 1 addition & 1 deletion run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ command -v pg_config
# prepare python environment
VENV_PATH="/tmp/testgres_venv"
rm -rf $VENV_PATH
virtualenv --python="/usr/bin/python${PYTHON_VERSION}" "${VENV_PATH}"
python${PYTHON_VERSION} -m venv "${VENV_PATH}"
export VIRTUAL_ENV_DISABLE_PROMPT=1
source "${VENV_PATH}/bin/activate"
pip install -r tests/requirements.txt
Expand Down