diff options
| author | Zuul <zuul@review.opendev.org> | 2025-03-28 20:23:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-03-28 20:23:14 +0000 |
| commit | 78c5638f37683aecc404e96e32f3f0abb618d1bb (patch) | |
| tree | e22a735d46b1e49b5d3003a3a775acdaa03de3f7 /docker/base | |
| parent | ec782ff297cb6c813f95db70d3d8eed64e78710b (diff) | |
| parent | 6da05fc6d59cb0015f557e291aaa6fe4e836e55b (diff) | |
| download | kolla-78c5638f37683aecc404e96e32f3f0abb618d1bb.tar.gz kolla-78c5638f37683aecc404e96e32f3f0abb618d1bb.zip | |
Merge "neutron: Add docker clients for ML2/OVS improvement"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/docker-ce.repo | 6 |
2 files changed, 8 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'}, diff --git a/docker/base/docker-ce.repo b/docker/base/docker-ce.repo new file mode 100644 index 000000000..d976c5852 --- /dev/null +++ b/docker/base/docker-ce.repo @@ -0,0 +1,6 @@ +[docker-ce] +name=Docker CE Stable - $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg |