aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j220
1 files changed, 1 insertions, 19 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 13372519f..9430f2d13 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -138,23 +138,12 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
{%- if not loop.last %} \{% endif %}
{% endfor -%}
- {% if install_metatype in ['rdo', 'mixed'] %}
-
{% for cmd in rpm_setup %}
{{ cmd }}
{% endfor %}
{% block base_centos_repo_overrides_post_rpm %}{% endblock %}
- {% endif %}
- {# endif for repo setup for all RHEL except RHEL OSP #}
-
- {% if install_metatype == 'rhos' %}
-
-{% block base_rhos_repo_enablement %}{% endblock %}
-
- {% endif %}
-
{% if base_distro == 'centos' %}
{% block base_centos_gpg_key_import %}
@@ -213,13 +202,6 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
{%- endif %}
{# Endif for base_distro centos #}
- {% if base_distro == 'rhel' %}
-
-{% block base_rhel_package_installation %}{% endblock %}
-
- {% endif %}
- {# Endif for base_distro RHEL #}
-
#### END REPO ENABLEMENT
{# We are back to the basic if conditional here which is:
@@ -391,7 +373,7 @@ RUN apt-get update \
{# endif base_package_type deb #}
{% endif %}
-{% if base_distro == 'centos' or base_distro == 'rhel' %}
+{% if base_distro == 'centos' %}
RUN sed -ri '/-session(\s+)optional(\s+)pam_systemd.so/d' /etc/pam.d/system-auth \
&& sed -ri '/^[^#]/ s/systemd//g' /etc/nsswitch.conf
{% endif %}