diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-31 17:48:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-31 17:48:08 +0000 |
| commit | dd0988f074a44c59e379f91fa38d6932e8e4651d (patch) | |
| tree | 6f2e0a64b593cee82753e3da9d91050b36df50c6 /docker/base | |
| parent | 014d055021263c9a5c539157b4030ee524f2731a (diff) | |
| parent | 19c5e97c8953314086c190b8810b5b1d5caf16f1 (diff) | |
| download | kolla-dd0988f074a44c59e379f91fa38d6932e8e4651d.tar.gz kolla-dd0988f074a44c59e379f91fa38d6932e8e4651d.zip | |
Merge "Allow operators to override versionlock for redhat in base"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 6042f57a4..473119c2d 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -157,11 +157,13 @@ RUN yum -y install \ {# We are back to the basic if conditional here which is: if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] #} +{% block base_redhat_binary_versionlock %} RUN yum -y update \ && yum -y install \ yum-plugin-versionlock \ && yum clean all COPY versionlock.list /etc/yum/pluginconf.d/ +{% endblock %} {% if install_type == 'binary' %} {% set base_centos_binary_packages = [ |