diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-27 11:40:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-27 11:40:13 +0000 |
| commit | 90d97c08575f5492cec0cde070fc8db7d78446bf (patch) | |
| tree | ba9498497ceb9cbeee6c9602440341615f6a3862 /docker/base | |
| parent | 1dc1041cb6b0fe8f11bfe852a840dea6fdebb13f (diff) | |
| parent | febbb5b40b88173f7167b384697617330a46bdea (diff) | |
| download | kolla-90d97c08575f5492cec0cde070fc8db7d78446bf.tar.gz kolla-90d97c08575f5492cec0cde070fc8db7d78446bf.zip | |
Merge "Add proxysql image"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/base/proxysql.repo | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b6344b37d..44afb8aa8 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -76,6 +76,7 @@ COPY dnf.conf /etc/dnf/dnf.conf 'elasticsearch.repo', 'grafana.repo', 'influxdb.repo', + 'proxysql.repo', 'rabbitmq_rabbitmq-server.repo', 'rabbitmq_rabbitmq-erlang.repo', 'td.repo', @@ -89,11 +90,13 @@ COPY dnf.conf /etc/dnf/dnf.conf 'https://repos.influxdata.com/influxdb.key', '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', + 'proxysql.repo', 'rabbitmq_rabbitmq-server.repo', 'td.repo', ] %} @@ -101,6 +104,7 @@ COPY dnf.conf /etc/dnf/dnf.conf {% set base_yum_repo_keys = [ 'https://packages.grafana.com/gpg.key', 'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc', + 'https://repo.proxysql.com/ProxySQL/repo_pub_key', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. # @@ -328,6 +332,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'}, {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdb.key'}, {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'}, + {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/repo_pub_key'}, {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'}, ] %} diff --git a/docker/base/proxysql.repo b/docker/base/proxysql.repo new file mode 100644 index 000000000..70bc14d96 --- /dev/null +++ b/docker/base/proxysql.repo @@ -0,0 +1,6 @@ +[proxysql] +name = ProxySQL +baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.3.x/centos/$releasever +gpgkey = https://repo.proxysql.com/ProxySQL/repo_pub_key +gpgcheck = 1 +enabled = 0 |