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/qdrouterd | |
| 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/qdrouterd')
| -rw-r--r-- | docker/qdrouterd/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 index 049bc5da1..a7885895c 100644 --- a/docker/qdrouterd/Dockerfile.j2 +++ b/docker/qdrouterd/Dockerfile.j2 @@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos'] %} # make sure qpid is pulled from centos-openstack-RELEASE (RDO) repo -RUN {% if distro_package_manager == 'dnf' %}dnf config-manager{% else %}yum-config-manager{% endif %} --disable epel centos-release-opstools extras +{{ macros.disable_extra_repos(['extras', 'opstools']) }} {% endif %} {{ macros.install_packages(qdrouterd_packages | customizable("packages")) }} |