openstack
/
kolla
Code Issues Proposed changes

Merge "Collapse down multiple yum install in openstack-base"

This commit is contained in:
Zuul 2018-04-26 10:59:10 +00:00 committed by Gerrit Code Review
parent cec256c76e eb24764e73
commit 41bf521a75
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/openstack-base/Dockerfile.j2
View File

@ -5,16 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% 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 install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
@ -26,7 +16,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'fontconfig', 'fontconfig',
'fontpackages-filesystem', 'fontpackages-filesystem',
'freetype', 'freetype',
'git',
'initscripts', 'initscripts',
'iproute',
'libjpeg-turbo', 'libjpeg-turbo',
'libpng', 'libpng',
'libX11', 'libX11',
@ -38,6 +30,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libxslt', 'libxslt',
'libyaml', 'libyaml',
'MySQL-python', 'MySQL-python',
'openssl',
'pyOpenSSL', 'pyOpenSSL',
'pyparsing', 'pyparsing',
'python-crypto', 'python-crypto',
@ -213,12 +206,15 @@ ENV DEBIAN_FRONTEND noninteractive
{% set openstack_base_packages = [ {% set openstack_base_packages = [
'gcc', 'gcc',
'gcc-c++', 'gcc-c++',
'git',
'iproute',
'libffi-devel', 'libffi-devel',
'libxml2-devel', 'libxml2-devel',
'libxslt-devel', 'libxslt-devel',
'libyaml-devel', 'libyaml-devel',
'mariadb-devel', 'mariadb-devel',
'openldap-devel', 'openldap-devel',
'openssl',
'openssl-devel', 'openssl-devel',
'postgresql', 'postgresql',
'postgresql-devel', 'postgresql-devel',