aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-05 16:53:34 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2022-09-27 07:40:06 +0000
commit878b00013b01e3d02a704ce7c9fac1629cd1a705 (patch)
tree218b3a4d1470a0c55006577d912d5369d60a8fb5 /docker/base/Dockerfile.j2
parentea3ed3f9332dbd7f369ca49806ee04000881c3c7 (diff)
downloadkolla-878b00013b01e3d02a704ce7c9fac1629cd1a705.tar.gz
kolla-878b00013b01e3d02a704ce7c9fac1629cd1a705.zip
Move to CentOS Stream 9
OpenStack 'zed' requires Python 3.8+ so RHEL 8 family has to go. This changeset moves to CentOS Stream 9 while move to RockyLinux 9 is planned as final solution. CI moved to CentOS Stream 9 nodes. Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/839715 Change-Id: I113b9984294cf8663d3fc0c8840320e1d40ea731
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j251
1 files changed, 33 insertions, 18 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a25be51c5..13af63149 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -62,10 +62,14 @@ COPY dnf.conf /etc/dnf/dnf.conf
{% endblock %}
#### BEGIN REPO ENABLEMENT
+{#
+Repo files not available for CentOS Stream 9:
+ 'elasticsearch.repo', # signed with SHA1 key https://github.com/elastic/elasticsearch/issues/85876
+ 'grafana.repo', # signed with SHA1 key https://github.com/grafana/grafana/issues/41036
+ 'proxysql.repo', # no repository yet for RHEL9 family
+ #}
{% set base_yum_repo_files = [
- 'elasticsearch.repo',
- 'grafana.repo',
- 'proxysql.repo',
+ 'mariadb.repo',
'rabbitmq_rabbitmq-server.repo',
'td.repo',
] %}
@@ -73,35 +77,41 @@ COPY dnf.conf /etc/dnf/dnf.conf
{% set base_yum_url_packages = [
] %}
-{% set base_yum_repo_keys = [
+{#
+SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
'https://packages.grafana.com/gpg.key',
+ #}
+{% set base_yum_repo_keys = [
'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
- 'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key',
- 'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
'https://packages.treasuredata.com/GPG-KEY-td-agent',
] %}
{% if base_arch == 'x86_64' %}
{% set base_yum_repo_files = base_yum_repo_files + [
'influxdb.repo',
- 'mariadb.repo',
'rabbitmq_rabbitmq-erlang.repo',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
# 'crmsh.repo',
{% set base_yum_repo_keys = base_yum_repo_keys + [
+ 'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
'https://repos.influxdata.com/influxdb.key',
] %}
{% elif base_arch == 'aarch64' %}
- {% set base_yum_repo_files = base_yum_repo_files + [
+{#
+Repo files not available for CentOS Stream 9:
'erlang-solutions.repo',
- 'mariadb-aarch64.repo',
+ #}
+ {% set base_yum_repo_files = base_yum_repo_files + [
] %}
- {% set base_yum_repo_keys = base_yum_repo_keys + [
+{#
+SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
+ #}
+ {% set base_yum_repo_keys = base_yum_repo_keys + [
] %}
{% endif %}
@@ -150,8 +160,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
] %}
{% set base_centos_yum_repo_packages = [
- 'centos-release-ceph-pacific',
- 'centos-release-nfv-extras',
+ 'centos-release-ceph-quincy',
'centos-release-nfv-openvswitch',
'centos-release-opstools',
'epel-release',
@@ -168,20 +177,26 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
# from delorean or rdo-release-* package
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
{% set base_centos_yum_repos_to_disable = [
- 'advanced-virtualization',
- 'centos-nfv-extras',
- 'centos-nfv-ovs',
- 'centos-ceph-pacific',
+ 'centos-ceph-quincy',
'centos-nfv-openvswitch',
'centos-opstools',
+ 'centos9-nfv-ovs',
+ 'centos9-opstools',
+ 'centos9-rabbitmq',
+ 'centos9-storage',
'epel',
- 'epel-modular',
] %}
{% if base_arch == 'x86_64' %}
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
'influxdb',
] %}
+{% elif base_arch == 'aarch64' %}
+
+{# NOTE(hrw): delorean-deps.repo may force x86-64 repos #}
+
+RUN sed -i -e "s/x86_64/aarch64/g" /etc/yum.repos.d/delorean-deps.repo
+
{% endif %}
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
@@ -204,9 +219,9 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
{% block base_redhat_binary_versionlock %}{% endblock %}
+{# NOTE(hrw): CentOS Stream 9 has curl-minimal, Rocky Linux 9 has curl so we do not install any #}
{% set base_centos_packages = [
'ca-certificates',
- 'curl',
'dumb-init',
'findutils',
'hostname',