diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-26 10:59:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-26 10:59:10 +0000 |
| commit | 41bf521a75f3c097d9f6a4871dd52bbe17233b34 (patch) | |
| tree | 4a43e555c553138245fb5c90d50f232d7c6d18e2 /docker/openstack-base/Dockerfile.j2 | |
| parent | cec256c76e9601290beff260341e61c41fcbee89 (diff) | |
| parent | eb24764e73d7d7f00848e0784785430c110633fa (diff) | |
| download | kolla-41bf521a75f3c097d9f6a4871dd52bbe17233b34.tar.gz kolla-41bf521a75f3c097d9f6a4871dd52bbe17233b34.zip | |
Merge "Collapse down multiple yum install in openstack-base"
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
| -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 436d76125..04f02901a 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', @@ -213,12 +206,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', |