diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-02 09:56:10 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-02 09:58:58 +0100 |
| commit | 2c2951b59b6e91c8f0ea6a82c1b3a9b16e1c02f7 (patch) | |
| tree | 65792c94c4cb996657aa60590b8066dc9703607a /docker/base | |
| parent | 90babe35d0e075ad15904bb2263e1dd019f10532 (diff) | |
| download | kolla-2c2951b59b6e91c8f0ea6a82c1b3a9b16e1c02f7.tar.gz kolla-2c2951b59b6e91c8f0ea6a82c1b3a9b16e1c02f7.zip | |
centos: disable EPEL by default
Our images use 'scsi-target-utils' from EPEL and then can be built
without it. So let's disable this repository right after installing
package from it.
Images can enable EPEL with 'enable_extra_repos' macro.
Also added 'disable_extra_repos' macro as we have some images in a need.
Change-Id: Id70474e7602b531b63fdc11ae690fd9ed33def74
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 48522109d..dadfa8e9e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -265,6 +265,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' %} |