base: do not duplicate repo data on CentOS

Instead of listing all repositories twice, do it just once and then add
architecture specific ones.

Change-Id: Icf0675c17a5227643148e9956496b8eacec67bee

1 files changed, 16 insertions, 29 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index c07920194..7867d6e11 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -66,57 +66,44 @@ COPY dnf.conf /etc/dnf/dnf.conf
 
 #### BEGIN REPO ENABLEMENT
 {% set base_yum_repo_files = [
- ] %}
+    'elasticsearch.repo',
+    'grafana.repo',
+    'proxysql.repo',
+    'rabbitmq_rabbitmq-server.repo',
+    'td.repo',
+] %}
 
 {% set base_yum_url_packages = [
 ] %}
 
 {% set base_yum_repo_keys = [
+    'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
+    'https://packages.grafana.com/gpg.key',
+    'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
+    'https://repo.proxysql.com/ProxySQL/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 = [
-        'elasticsearch.repo',
-        'grafana.repo',
+    {% set base_yum_repo_files = base_yum_repo_files + [
         'influxdb.repo',
         'mariadb.repo',
-        'proxysql.repo',
-        'rabbitmq_rabbitmq-server.repo',
         'rabbitmq_rabbitmq-erlang.repo',
-        'td.repo',
     ] %}
     # FIXME(mgoddard): Not available for CentOS 8 yet.
     #   'crmsh.repo',
 
-    {% set base_yum_repo_keys = [
-        'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
-        'https://packages.grafana.com/gpg.key',
+    {% set base_yum_repo_keys = base_yum_repo_keys + [
         'https://repos.influxdata.com/influxdb.key',
-        'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
-        'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
-        'https://packages.treasuredata.com/GPG-KEY-td-agent',
-        'https://repo.proxysql.com/ProxySQL/repo_pub_key',
     ] %}
 {% elif base_arch == 'aarch64' %}
-    {% set base_yum_repo_files = [
-        'elasticsearch.repo',
-        'grafana.repo',
+    {% set base_yum_repo_files = base_yum_repo_files + [
         'mariadb-aarch64.repo',
-        'proxysql.repo',
-        'rabbitmq_rabbitmq-server.repo',
-        'td.repo',
     ] %}
 
-    {% set base_yum_repo_keys = [
-        'https://packages.grafana.com/gpg.key',
-        'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
-        'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
-        'https://repo.proxysql.com/ProxySQL/repo_pub_key',
+    {% set base_yum_repo_keys = base_yum_repo_keys + [
     ] %}
-    # FIXME(mgoddard): Not available for CentOS 8 yet.
-    #
-    #   'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
-    #
 {% endif %}
 
 {%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}