diff --git a/infra/image/inventory b/infra/image/build-inventory similarity index 77% rename from infra/image/inventory rename to infra/image/build-inventory index 4a83eb75ccf7e07e6b5efd2acdbbd2c082b5a5a5..41f5feb608926a10d00ea456810a2acd982a5549 100644 --- a/infra/image/inventory +++ b/infra/image/build-inventory @@ -1,5 +1,5 @@ [ipaserver] -ansible-freeipa-image-builder ansible_connection=podman ansible_python_interpreter=/usr/bin/python3 +ansible-freeipa-image-builder ansible_connection=podman [ipaserver:vars] ipaadmin_password=SomeADMINpassword diff --git a/infra/image/build.sh b/infra/image/build.sh index dc6b992d838b5b75aa72da8040286a0cac1bd234..a17f2f6d125ab4a76cb4636c70ef9167bafeae67 100755 --- a/infra/image/build.sh +++ b/infra/image/build.sh @@ -68,7 +68,7 @@ then deploy_playbook="${TOPDIR}/playbooks/install-server.yml" [ -f "${deploy_playbook}" ] || die "Can't find playbook '${deploy_playbook}'" - inventory_file="${BASEDIR}/inventory" + inventory_file="${BASEDIR}/build-inventory" [ -f "${inventory_file}" ] || die "Can't find inventory '${inventory_file}'" fi diff --git a/infra/image/dockerfile/c10s b/infra/image/dockerfile/c10s index 622098f36b7cb84b2772ba6dfa17810c6720bf01..18d48147591deb16a1428ec29882b8a5c3845431 100644 --- a/infra/image/dockerfile/c10s +++ b/infra/image/dockerfile/c10s @@ -4,7 +4,6 @@ ENV container=podman RUN rm -fv /var/cache/dnf/metadata_lock.pid; \ dnf makecache; \ dnf --assumeyes install \ - /usr/bin/python3 \ /usr/bin/dnf-3 \ sudo \ bash \ diff --git a/infra/image/dockerfile/c8s b/infra/image/dockerfile/c8s index 87a5b82e685258dab30c53ebbd5283adab7b7adc..a59879f1e8fd6bfbe008479412607294d8b6e248 100644 --- a/infra/image/dockerfile/c8s +++ b/infra/image/dockerfile/c8s @@ -7,8 +7,6 @@ sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo; \ sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo; \ dnf makecache; \ dnf --assumeyes install \ - /usr/bin/python3 \ - /usr/bin/python3-config \ /usr/bin/dnf-3 \ sudo \ bash \ diff --git a/infra/image/dockerfile/c9s b/infra/image/dockerfile/c9s index 5fe77d926732c871a71e134cf0adfa3fb8883c14..5897d9ff44a350e8b57c24c59706fa52faeaad59 100644 --- a/infra/image/dockerfile/c9s +++ b/infra/image/dockerfile/c9s @@ -4,7 +4,6 @@ ENV container=podman RUN rm -fv /var/cache/dnf/metadata_lock.pid; \ dnf makecache; \ dnf --assumeyes install \ - /usr/bin/python3 \ /usr/bin/dnf-3 \ sudo \ bash \