diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-31 14:59:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-31 14:59:46 +0000 |
| commit | c22af045e6a056d0771b31f47bfb7a7c837daa65 (patch) | |
| tree | cf64a94c64871ea35feb93328713ce566c3f6682 /docker | |
| parent | 5f0ea5847f7a4307a416afc270c48c67a7809726 (diff) | |
| parent | f6e8430741250bf489cc79f378092e5603ccde2d (diff) | |
| download | kolla-c22af045e6a056d0771b31f47bfb7a7c837daa65.tar.gz kolla-c22af045e6a056d0771b31f47bfb7a7c837daa65.zip | |
Merge "Add a block around oraclelinux base package install"
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..6da12b197 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -114,6 +114,7 @@ RUN yum -y install \ {% if base_distro == 'oraclelinux' %} +{% block base_oraclelinux_package_installation %} COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo RUN yum -y install \ tar \ @@ -133,6 +134,7 @@ RUN yum -y install \ && yum -y install \ yum-plugin-priorities \ && yum clean all +{% endblock %} {% endif %} {# Endif for base_distro oraclelinux #} |