diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-08-31 14:32:15 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-08-31 13:38:24 +0000 |
| commit | f6e8430741250bf489cc79f378092e5603ccde2d (patch) | |
| tree | d5501cb2211fd5822c20f30677690e2f21229435 /docker | |
| parent | 624d300dc4e736bfcaa33ba8b339770a98552e8c (diff) | |
| download | kolla-f6e8430741250bf489cc79f378092e5603ccde2d.tar.gz kolla-f6e8430741250bf489cc79f378092e5603ccde2d.zip | |
Add a block around oraclelinux base package install
Allow operators to customise the base package setup for oraclelinux in
base, similar to Ubuntu (block base_ubuntu_package_installation)
TrivialFix
Change-Id: I9c790bd4f195492dc9d666cf865a7f142cfb1abe
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 #} |