diff options
| author | Jon Schlueter <jschluet@redhat.com> | 2018-04-25 01:02:44 -0400 |
|---|---|---|
| committer | Jon Schlueter <jschluet@redhat.com> | 2018-04-25 06:26:48 -0400 |
| commit | eb24764e73d7d7f00848e0784785430c110633fa (patch) | |
| tree | d9f20e321de6d42bc6e6e49af3f88d6de1ddb0e0 | |
| parent | cc8e8c9f02cd9198d1425384eb3824b675a62f9f (diff) | |
| download | kolla-eb24764e73d7d7f00848e0784785430c110633fa.tar.gz kolla-eb24764e73d7d7f00848e0784785430c110633fa.zip | |
Collapse down multiple yum install in openstack-base
For rhel/centos/oraclelinux there were 2 yum install
sections, collapse/folded the 3 packages from that section
into the other blocks in sorted order
Change-Id: I8a3d212314891635509aeeb346998ace713feefa
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index b8b09ef89..f47bd60c7 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -5,16 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set openstack_base_packages = [ - 'git', - 'iproute', - 'openssl' - ] %} - -{{ macros.install_packages(openstack_base_packages) }} - -{% endif %} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} @@ -26,7 +16,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'fontconfig', 'fontpackages-filesystem', 'freetype', + 'git', 'initscripts', + 'iproute', 'libjpeg-turbo', 'libpng', 'libX11', @@ -38,6 +30,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libxslt', 'libyaml', 'MySQL-python', + 'openssl', 'pyOpenSSL', 'pyparsing', 'python-crypto', @@ -215,12 +208,15 @@ ENV DEBIAN_FRONTEND noninteractive {% set openstack_base_packages = [ 'gcc', 'gcc-c++', + 'git', + 'iproute', 'libffi-devel', 'libxml2-devel', 'libxslt-devel', 'libyaml-devel', 'mariadb-devel', 'openldap-devel', + 'openssl', 'openssl-devel', 'postgresql', 'postgresql-devel', |