openstack/kolla-ansible
Code Issues Proposed changes

Customizations for kolla-toolbox

Browse Source 
This patchset contains customization of Dockerfile
of kolla-toolbox containers.

Change-Id: Idd141935012874e1184c1d88cd0e0fdc37e1b6c9
This commit is contained in:
Revanth Alampally 2016-08-05 15:48:35 -07:00
parent 306bc101d1
commit 464542b4a5
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
docker/kolla-toolbox/Dockerfile.j2
View File

@ -3,41 +3,42 @@ MAINTAINER {{ maintainer }}
{% set os_client_config='/usr/lib/python2.7/site-packages/os_client_config/defaults.json' %} {% set os_client_config='/usr/lib/python2.7/site-packages/os_client_config/defaults.json' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% import "macros.j2" as macros with context %}
RUN yum -y install \ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
gcc \ {% set kolla_toolbox_packages = [
gdisk \ 'gcc',
git \ 'gdisk',
libffi-devel \ 'git',
libxml2-devel \ 'libffi-devel',
libxslt-devel \ 'libxml2-devel',
MariaDB-devel \ 'libxslt-devel',
MariaDB-shared \ 'MariaDB-devel',
openssl-devel \ 'MariaDB-shared',
python-devel \ 'openssl-devel',
openssh-clients \ 'python-devel',
&& yum clean all 'openssh-clients'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set kolla_toolbox_packages = [
RUN apt-get -y --no-install-recommends install \ 'build-essential',
build-essential \ 'ca-certificates',
ca-certificates \ 'gdisk',
gdisk \ 'git',
git \ 'libffi-dev',
libffi-dev \ 'libmariadbclient-dev',
libmariadbclient-dev \ 'libssl-dev',
libssl-dev \ 'libxslt1-dev',
libxslt1-dev \ 'python-dev'
python-dev \ ] %}
&& apt-get clean
{% if base_distro == 'debian' %} {% if base_distro == 'debian' %}
{% set os_client_config='/usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' %} {% set os_client_config='/usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' %}
{% endif %} {% endif %}
{% endif %} {% endif %}
RUN {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \ && python get-pip.py \
@ -63,6 +64,8 @@ RUN chmod 440 /etc/sudoers.d/ansible_sudoers
CMD ["/bin/sleep", "infinity"] CMD ["/bin/sleep", "infinity"]
{% block kolla_toolbox_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER ansible USER ansible