diff options
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 51 | ||||
| -rw-r--r-- | docker/base/mariadb-aarch64.repo | 6 | ||||
| -rw-r--r-- | docker/base/mariadb.repo | 2 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-erlang.repo | 1 |
4 files changed, 35 insertions, 25 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', diff --git a/docker/base/mariadb-aarch64.repo b/docker/base/mariadb-aarch64.repo deleted file mode 100644 index 79929e8e9..000000000 --- a/docker/base/mariadb-aarch64.repo +++ /dev/null @@ -1,6 +0,0 @@ -[mariadb] -name = MariaDB Server -baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/8/aarch64 -gpgcheck = 1 -enabled = 0 -module_hotfixes = 1 diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo index 7420fcd35..43ea786a5 100644 --- a/docker/base/mariadb.repo +++ b/docker/base/mariadb.repo @@ -1,6 +1,6 @@ [mariadb] name = MariaDB Server -baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/8/x86_64 +baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/$releasever/$basearch gpgcheck = 1 enabled = 0 module_hotfixes = 1 diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo index bcb4f40f1..59d49c492 100644 --- a/docker/base/rabbitmq_rabbitmq-erlang.repo +++ b/docker/base/rabbitmq_rabbitmq-erlang.repo @@ -1,5 +1,6 @@ [rabbitmq_rabbitmq-erlang] name=rabbitmq_rabbitmq-erlang +# https://www.rabbitmq.com/install-rpm.html lists "el/8" for CentOS Stream 9 baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch gpgcheck=1 enabled=0 |