aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2025-03-28 20:23:14 +0000
committerGerrit Code Review <review@openstack.org>2025-03-28 20:23:14 +0000
commit78c5638f37683aecc404e96e32f3f0abb618d1bb (patch)
treee22a735d46b1e49b5d3003a3a775acdaa03de3f7 /docker/base/Dockerfile.j2
parentec782ff297cb6c813f95db70d3d8eed64e78710b (diff)
parent6da05fc6d59cb0015f557e291aaa6fe4e836e55b (diff)
downloadkolla-78c5638f37683aecc404e96e32f3f0abb618d1bb.tar.gz
kolla-78c5638f37683aecc404e96e32f3f0abb618d1bb.zip
Merge "neutron: Add docker clients for ML2/OVS improvement"
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 6eb106d81..6bd94a2cc 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -52,6 +52,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
#### BEGIN REPO ENABLEMENT
{% set base_yum_repo_files = [
+ 'docker-ce.repo',
'grafana.repo',
'influxdb.repo',
'mariadb.repo',
@@ -303,6 +304,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
{% set base_remote_apt_keys = [
+ {'name': 'docker-ce', 'url': 'https://download.docker.com/linux/debian/gpg'},
{'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'},
{'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
{'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},