Skip to content

Commit 1e0743f

Browse files
committed
Minimal centos9 image without python3.9
Also removes `subversion`, as it hard-depends upon `python3.9`.
1 parent 00fe06c commit 1e0743f

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

execution-environment.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
version: 3
33
images:
44
base_image:
5-
name: quay.io/centos/centos:stream9
5+
name: quay.io/centos/centos:stream9-minimal
6+
options:
7+
package_manager_path: /usr/bin/microdnf
68
dependencies:
9+
python_interpreter:
10+
package_system: python3.11
11+
python_path: /usr/bin/python3.11
712
ansible_core:
813
# Require minimum of 2.15 to get ansible-inventory --limit option
914
package_pip: ansible-core>=2.15.0rc2,<2.16
@@ -28,17 +33,15 @@ dependencies:
2833
- name: kubevirt.core
2934
system: |
3035
git-core [platform:rpm]
31-
python3.9-devel [platform:rpm compile]
36+
python3.11-devel [platform:rpm compile]
37+
python3.11-rpm [platform:rpm epel]
3238
libcurl-devel [platform:rpm compile]
3339
krb5-devel [platform:rpm compile]
3440
krb5-workstation [platform:rpm]
35-
subversion [platform:rpm]
36-
subversion [platform:dpkg]
3741
git-lfs [platform:rpm]
3842
sshpass [platform:rpm]
3943
rsync [platform:rpm]
4044
epel-release [platform:rpm]
41-
python-unversioned-command [platform:rpm]
4245
unzip [platform:rpm]
4346
podman-remote [platform:rpm]
4447
cmake [platform:rpm compile]
@@ -60,10 +63,19 @@ dependencies:
6063
pyyaml
6164
six
6265
receptorctl
66+
exclude:
67+
system:
68+
- python3
69+
- python3-devel
70+
- python3-rpm
6371
additional_build_steps:
6472
append_base:
6573
- RUN $PYCMD -m pip install -U pip
6674
append_final:
6775
- COPY --from=quay.io/ansible/receptor:devel /usr/bin/receptor /usr/bin/receptor
6876
- RUN mkdir -p /var/run/receptor
6977
- RUN git lfs install --system
78+
- >-
79+
RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1
80+
&& alternatives --install /usr/bin/python python /usr/bin/python3.11 1
81+
&& alternatives --install /usr/bin/pip3 pip3 /usr/bin/pip3.11 1

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
git+https://github.com/ansible/ansible-builder.git@devel#egg=ansible-builder
1+
git+https://github.com/ansible/ansible-builder.git@devel#egg=ansible-builder

0 commit comments

Comments
 (0)