diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-24 15:26:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-24 15:26:13 +0000 |
| commit | a7f9817a3e9a104660f54e57c85a0dae77ec2572 (patch) | |
| tree | 89615f65b310edf45f670161a790edfecc3678b5 /docker | |
| parent | 86907688802f2633d165271eff08cdcdc0284b33 (diff) | |
| parent | 7ae5f1fe629554e588cd3992666af139e1efd9ce (diff) | |
| download | kolla-a7f9817a3e9a104660f54e57c85a0dae77ec2572.tar.gz kolla-a7f9817a3e9a104660f54e57c85a0dae77ec2572.zip | |
Merge "Add a variable to configure repos disabled in base CentOS image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 1dd20b42b..7126d7c33 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -153,13 +153,18 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'yum-plugin-priorities' ] %} -{{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages")) }} -{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %} - {%- if loop.first %}RUN {% else %} && {% endif -%} - rpm --import {{ key }} \ +{% set base_centos_yum_repos_to_disable = [ +] %} + +RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \ +{% for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') -%} + && yum-config-manager --disable {{ repo }} \ +{% endfor -%} +{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%} + && rpm --import {{ key }} \ {% endfor -%} -{%- if base_centos_yum_repo_keys|customizable('centos_yum_repo_keys')|length == 0 %}RUN {% else %} && {% endif -%} - {{ macros.rpm_security_update(clean_package_cache) }} + && {{ macros.rpm_security_update(clean_package_cache) }} + {%- endif %} {# Endif for base_distro centos #} |