diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-08-31 14:47:17 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-08-31 14:47:17 +0100 |
| commit | 19c5e97c8953314086c190b8810b5b1d5caf16f1 (patch) | |
| tree | 9d87e58d768fa951f235d1c7b92f6883564da233 /docker | |
| parent | 624d300dc4e736bfcaa33ba8b339770a98552e8c (diff) | |
| download | kolla-19c5e97c8953314086c190b8810b5b1d5caf16f1.tar.gz kolla-19c5e97c8953314086c190b8810b5b1d5caf16f1.zip | |
Allow operators to override versionlock for redhat in base
TrivialFix
Change-Id: Iedec701e76cdf4e336abeae1286ba6359fcfeba1
Diffstat (limited to 'docker')
| -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 cd5baf12e..015d4a965 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -155,11 +155,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 = [ |