diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-02 13:04:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-02 13:04:20 +0000 |
| commit | 28a61bfceb27441f0f0b017091c778c2ddcb0fa0 (patch) | |
| tree | 61b9c920fcee93dcd9368903d458ed974a4694c5 /docker | |
| parent | 04eef90e514135394a0a61e557b83be77ee254c1 (diff) | |
| parent | 8260bfb348b35a707e325a4789d5ab9f9983048c (diff) | |
| download | kolla-28a61bfceb27441f0f0b017091c778c2ddcb0fa0.tar.gz kolla-28a61bfceb27441f0f0b017091c778c2ddcb0fa0.zip | |
Merge "Add blocks to customize RHEL package installation"
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 e9fa65db3..9d349ee09 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -102,6 +102,7 @@ RUN true \ {% if base_distro == 'rhel' %} +{% block base_rhel_package_installation %} # Enable couple required repositories for all RHEL builds # Turn on EPEL throughout the build RUN yum -y install \ @@ -112,6 +113,7 @@ RUN yum -y install \ && yum clean all \ && yum-config-manager --enable rhel-7-server-optional-rpms \ && yum-config-manager --enable rhel-7-server-extras-rpms +{% endblock %} {% endif %} {# Endif for base_distro RHEL #} |