openstack
/
kolla
Code Issues Proposed changes

Enable source for openstack-base for RPM distros 

Make openstack-base optimized for from source builds for RPM based
distributions.

backport: liberty

Change-Id: I5f1056ebc09fd55cd5d46da7a09331e38940d888
Implements: blueprint openstack-common-container
(cherry picked from commit fbb1842fc8)
This commit is contained in:
Steven Dake 2015-10-06 11:42:52 -07:00
parent 7aca5c468e
commit 98177b5ef5
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docker/base/Dockerfile.j2
View File

@ -140,31 +140,15 @@ RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \
{% endif %}
# Update packages
RUN yum update -y \
&& yum install -y \
epel-release \
gcc \
gcc-c++ \
git \
libffi-devel \
libxml2-devel \
libxslt-devel \
mariadb-devel \
mysql-devel \
openldap-devel \
openssl \
openssl-devel \
postgresql \
postgresql-devel \
python-devel \
sqlite-devel \
RUN yum -y install \
curl \
sudo \
tar \
which \
&& yum clean all
# endif for install type is source for RPM based distros
{% endif %}
# endif for install type is binary/rhos/rdo for RPM based distros
# endif for base_distro centos,fedora,oraclelinux,rhel
{% elif base_distro in ['ubuntu', 'debian'] %}

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

@ -38,8 +38,25 @@ RUN yum -y install \
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
{% if base_distro in ['ubuntu', 'debian'] %}
RUN yum -y install \
gcc \
gcc-c++ \
libffi-devel \
libxml2-devel \
libxslt-devel \
mariadb-devel \
mysql-devel \
openldap-devel \
openssl-devel \
postgresql \
postgresql-devel \
python-devel \
sqlite-devel \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
curl \