Merge "Make a openstack-common container for CentOS variants"

This commit is contained in:
Jenkins 2015-09-29 12:27:10 +00:00 committed by Gerrit Code Review
commit e6a9da2022
2 changed files with 35 additions and 85 deletions

View File

@ -122,88 +122,6 @@ RUN yum update -y \
# Install base packages
RUN yum install -y \
git \
iproute \
mariadb-libs \
MySQL-python \
openssl \
openstack-utils \
pyparsing \
python-alembic \
python-amqp \
python-amqplib \
python-anyjson \
python-boto \
python-cheetah \
python-cliff \
python-cmd2 \
python-croniter \
python-crypto \
python-d2to1 \
python-docutils \
python-dogpile-cache \
python-dogpile-core \
python-empy \
python-eventlet \
python-flask \
python-futures \
python-greenlet \
python-httplib2 \
python-iso8601 \
python-itsdangerous \
python-jinja2 \
python-jsonpatch \
python-jsonpath-rw \
python-jsonpointer \
python-jsonschema \
python-keyring \
python-kombu \
python-ldap \
python-lesscpy \
python-lockfile \
python-lxml \
python-markdown \
python-memcached \
python-migrate \
python-msgpack \
python-netifaces \
python-networkx \
python-oauthlib \
python-openstackclient \
python-oslo-config \
python-oslo-messaging \
python-oslo-rootwrap \
python-oslo-policy \
python-paramiko \
python-passlib \
python-paste-deploy \
python-pbr \
python-pecan \
python-pip \
python-ply \
python-prettytable \
python-psutil \
python-pycadf \
python-pygments \
python-pymongo \
python-qpid \
python-repoze-lru \
python-requests \
python-routes \
python-simplegeneric \
python-simplejson \
python-singledispatch \
python-six \
python-sqlalchemy \
python-stevedore \
python-taskflow \
python-versiontools \
python-warlock \
python-webob \
python-websockify \
python-webtest \
python-werkzeug \
python-wsme \
sudo \
which \
&& yum clean all

View File

@ -1,13 +1,45 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
git \
iproute \
mariadb-libs \
MySQL-python \
openssl \
patch \
&& yum clean all
{% endif %}
{% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
RUN yum -y install patch \
RUN yum -y install \
python-barbicanclient \
python-ceilometerclient \
python-congressclient \
python-designateclient \
python-heatclient \
python-ironicclient \
python-magnumclient \
python-manilaclient \
python-mistralclient \
python-muranoclient \
python-pip \
python-saharaclient \
python-swiftclient \
python-troveclient \
python-tuskarclient \
python-zaqarclient \
python-openstackclient \
MySQL-python \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
curl \