Merge "Manila ubuntu binary container"

This commit is contained in:
Jenkins 2016-03-17 15:45:12 +00:00 committed by Gerrit Code Review
commit bbe08628d0
3 changed files with 21 additions and 0 deletions
docker/manila
manila-api
manila-base
manila-scheduler

@ -1,6 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
manila-api \
&& apt-get clean
{% endif%}
{% endif%}
COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
RUN chmod 755 /usr/local/bin/kolla_manila_extend_start

@ -12,6 +12,7 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
manila-common \
openvswitch-switch \
&& apt-get clean

@ -1,6 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
manila-scheduler \
&& apt-get clean
{% endif%}
{% endif%}
{{ include_footer }}
USER manila