diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-21 19:42:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-21 19:42:13 +0000 |
| commit | 3ddc0b9820767a7ddbc9acc9e39357272fd3aa33 (patch) | |
| tree | 44ec684b058ee6cfef7ccdd260e222e7053b9da3 /docker/base | |
| parent | 16e0fb9b860d1608f7ac6fdb949251ca73c34730 (diff) | |
| parent | 2c2951b59b6e91c8f0ea6a82c1b3a9b16e1c02f7 (diff) | |
| download | kolla-3ddc0b9820767a7ddbc9acc9e39357272fd3aa33.tar.gz kolla-3ddc0b9820767a7ddbc9acc9e39357272fd3aa33.zip | |
Merge "centos: disable EPEL by default"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 521bf83bc..f1f3b63fe 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -269,6 +269,7 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ # Install base packages {{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }} +{{ macros.disable_extra_repos('epel') }} {# endif for base_package_type rpm #} {% elif base_package_type == 'deb' %} |