aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j2178
-rw-r--r--docker/base/set_configs.py2
-rw-r--r--docker/base/yum.conf10
3 files changed, 45 insertions, 145 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 9670dcdf4..a0a0ffebe 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -44,37 +44,29 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho
# enables to provide repo overrides at a later date in a simple fashion if we
# desire such functionality. I think we will :)
-{# FIXME(mgoddard): Remove special case for CentOS 8 when CentOS 7 is no #}
-{# longer supported. #}
RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release); \
- if [ $CURRENT_DISTRO_RELEASE != "{{ supported_distro_release }}" ] && [ $CURRENT_DISTRO_RELEASE != 8 ]; then \
- echo "Only releases '{{ supported_distro_release }}' and '8' are supported on {{ base_distro }}"; false; \
+ if [ $CURRENT_DISTRO_RELEASE != "{{ supported_distro_release }}" ]; then \
+ echo "Only releases '{{ supported_distro_release }}' are supported on {{ base_distro }}"; false; \
fi \
&& cat /tmp/kolla_bashrc >> /etc/bashrc \
- && sed -i 's|^\(override_install_langs=.*\)|# \1|' {% if distro_package_manager == 'dnf' %}/etc/dnf/dnf.conf{% else %}/etc/yum.conf{% endif %}
+ && sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/dnf/dnf.conf
{% block base_yum_conf %}
-{% if distro_package_manager == 'dnf' %}
COPY dnf.conf /etc/dnf/dnf.conf
-{% else %}
-COPY yum.conf /etc/yum.conf
-{% endif %}
{% endblock %}
# Install what is needed for en_US.UTF-8
{% block base_centos_distro_sync_and_languages %}
-{% if distro_package_manager == 'dnf' %}
- {% set base_centos_language_packages = [
- 'langpacks-en',
- 'glibc-all-langpacks'
- ] %}
+{% set base_centos_language_packages = [
+ 'langpacks-en',
+ 'glibc-all-langpacks'
+] %}
RUN {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \
&& {{ macros.rpm_security_update(clean_package_cache) }}
-{% endif %}
{% endblock %}
@@ -97,13 +89,9 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen
'td.repo',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
- {% if distro_package_manager == 'yum' %}
- {% set base_yum_repo_files = base_yum_repo_files + [
- 'crmsh.repo',
- 'elasticsearch.repo',
- 'opendaylight.repo',
- ] %}
- {% endif %}
+ # 'crmsh.repo',
+ # 'elasticsearch.repo',
+ # 'opendaylight.repo',
{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',
@@ -112,11 +100,9 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen
'https://packages.treasuredata.com/GPG-KEY-td-agent',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
- {% if distro_package_manager == 'yum' %}
- {% set base_yum_repo_keys = base_yum_repo_keys + [
- 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
- ] %}
- {% endif %}
+ #
+ # 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
+ #
{% elif base_arch == 'aarch64' %}
{% set base_yum_repo_files = [
'grafana.repo',
@@ -124,11 +110,9 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen
'rabbitmq_rabbitmq-erlang-aarch64.repo',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
- {% if distro_package_manager == 'yum' %}
- {% set base_yum_repo_files = base_yum_repo_files + [
- 'elasticsearch.repo',
- ] %}
- {% endif %}
+ #
+ # 'elasticsearch.repo',
+ #
{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',
@@ -136,30 +120,24 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen
'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/centos7/repodata/repomd.xml.key',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
- {% if distro_package_manager == 'yum' %}
- {% set base_yum_repo_keys = base_yum_repo_keys + [
- 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
- ] %}
- {% endif %}
+ #
+ # 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
+ #
{% elif base_arch == 'ppc64le' %}
{% set base_yum_repo_files = [
'rabbitmq_rabbitmq-server.repo',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
- {% if distro_package_manager == 'yum' %}
- {% set base_yum_repo_files = base_yum_repo_files + [
- 'elasticsearch.repo',
- ] %}
- {% endif %}
+ #
+ # 'elasticsearch.repo',
+ #
{% set base_yum_repo_keys = [
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
- {% if distro_package_manager == 'yum' %}
- {% set base_yum_repo_keys = base_yum_repo_keys + [
- 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
- ] %}
- {% endif %}
+ #
+ # 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
+ #
{% endif %}
{%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}
@@ -199,97 +177,62 @@ RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \
{% if install_metatype == 'rhos' %}
-{% block base_rhos_repo_enablement %}
-# Turn on the RHOS 7.0 repo for RHOS
-RUN yum-config-manager --enable rhel-7-server-rpms \
- && yum-config-manager --enable rhel-7-server-openstack-7.0-rpms
-{% endblock %}
+{% block base_rhos_repo_enablement %}{% endblock %}
{% endif %}
{% if base_distro == 'centos' %}
{% block base_centos_gpg_key_import %}
-{% if distro_package_manager == 'dnf' %}
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-{% else %}
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-{% endif %}
{% endblock %}
{% set base_centos_yum_repo_keys = [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
-{% if distro_package_manager == 'yum' %}
- {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
- '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
- '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
- ] %}
-{% endif %}
+#
+# '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
+# '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
+#
{% set base_centos_yum_repo_packages = [
'centos-release-opstools',
'epel-release',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
-{% if distro_package_manager == 'yum' %}
- {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
- 'centos-release-ceph-nautilus',
- 'centos-release-qemu-ev',
- ] %}
+#
+# 'centos-release-ceph-nautilus',
+#
# FIXME(mnasiadka): Replace with CentOS Storage SIG packages when avail
-{% else %}
COPY ceph.repo /etc/yum.repos.d/
-{% endif %}
-{% if distro_package_manager == 'dnf' %}
- # We need 'dnf-plugins-core' for 'dnf config-manager'
- {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
- 'dnf-plugins-core'
- ] %}
- {% set base_centos_yum_repos_to_enable = [
- 'PowerTools'
- ] %}
-{% else %}
- {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
- 'yum-plugin-priorities',
- ] %}
-{% endif %}
+# We need 'dnf-plugins-core' for 'dnf config-manager'
+{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
+ 'dnf-plugins-core'
+] %}
+{% set base_centos_yum_repos_to_enable = [
+ 'PowerTools'
+] %}
{% set base_centos_yum_repos_to_disable = [
'centos-ceph-nautilus',
'centos-nfs-ganesha28',
] %}
-
{% if base_arch == 'x86_64' %}
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
'influxdb',
] %}
{% endif %}
-{% if distro_package_manager == 'yum' %}
- {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
- 'centos-qemu-ev',
- ] %}
-{% endif %}
-
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \
{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %}
-{%- if distro_package_manager == 'dnf' %}
&& dnf config-manager --enable {{ repo }} \
-{% else %}
- && yum-config-manager --enable {{ repo }} \
-{% endif -%}
{% endfor -%}
{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %}
-{%- if distro_package_manager == 'dnf' %}
&& dnf config-manager --disable {{ repo }} \
-{%- else %}
- && yum-config-manager --disable {{ repo }} \
-{%- endif -%}
-{%- endfor %}
+{% endfor -%}
{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%}
&& rpm --import {{ key }} \
{% endfor -%}
@@ -301,21 +244,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
{% if base_distro == 'rhel' %}
-{% block base_rhel_package_installation %}
-# Enable couple required repositories for all RHEL builds
-# Turn on EPEL throughout the build
-RUN yum-config-manager --enable rhel-7-server-optional-rpms \
- && {{ macros.install_packages( ['yum-plugin-priorities' ], chain=True, clean=False) }} \
- {%- if install_type != 'binary' or install_metatype != 'rdo' %}
- && {{ macros.install_packages( [ 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' ], chain=True, clean=False) }} \
- && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
- {% endif -%}
- && yum-config-manager --enable rhel-7-server-extras-rpms \
- && yum-config-manager --enable rhel-7-server-rhceph-2-osd-rpms \
- && yum-config-manager --enable rhel-7-server-rhceph-2-mon-rpms \
- && yum-config-manager --enable rhel-7-server-rhceph-2-tools-rpms \
- && {{ macros.rpm_security_update(clean_package_cache) }}
-{% endblock %}
+{% block base_rhel_package_installation %}{% endblock %}
{% endif %}
{# Endif for base_distro RHEL #}
@@ -336,29 +265,13 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
'lvm2',
'ncurses',
'procps-ng',
+ 'python3',
'socat',
'sudo',
'tar',
+ 'util-linux-user',
'which'
] %}
-{% if distro_python_version.startswith('3') %}
- {% set base_centos_packages = base_centos_packages + [
- 'python3'
- ] %}
-{% else %}
- {% set base_centos_packages = base_centos_packages + [
- 'python'
- ] %}
-{% endif %}
-{% if distro_package_manager == 'dnf' %}
- {% set base_centos_packages = base_centos_packages + [
- 'util-linux-user',
- ] %}
-{% else %}
- {% set base_centos_packages = base_centos_packages + [
- 'scsi-target-utils',
- ] %}
-{% endif %}
# Install base packages
{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }}
@@ -512,9 +425,6 @@ RUN sed -ri '/-session(\s+)optional(\s+)pam_systemd.so/d' /etc/pam.d/system-auth
{% endif %}
COPY set_configs.py /usr/local/bin/kolla_set_configs
-{% if distro_python_version.startswith('3') %}
-RUN sed -i -e "s+#\!/usr/bin/env python+#\!/usr/bin/env python3+g" /usr/local/bin/kolla_set_configs
-{% endif %}
COPY start.sh /usr/local/bin/kolla_start
COPY copy_cacerts.sh /usr/local/bin/kolla_copy_cacerts
COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py
index 93a758f1d..5f030866f 100644
--- a/docker/base/set_configs.py
+++ b/docker/base/set_configs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/docker/base/yum.conf b/docker/base/yum.conf
deleted file mode 100644
index cac98d8de..000000000
--- a/docker/base/yum.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[main]
-keepcache=0
-logfile=/var/log/yum.log
-exactarch=1
-obsoletes=1
-gpgcheck=1
-plugins=1
-installonly_limit=0
-skip_missing_names_on_install=False
-tsflags=nodocs
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 21:21:15 +0000