openstack/kolla-ansible
Code Issues Proposed changes

Merge "Murano ubuntu binary container"

Browse Source
This commit is contained in:
Jenkins 2016-01-15 08:44:53 +00:00 committed by Gerrit Code Review
commit 853bb47d9a
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/murano/murano-api/Dockerfile.j2
View File

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

8
docker/murano/murano-base/Dockerfile.j2
View File

@ -2,10 +2,18 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
murano-common \
&& apt-get clean
{% else %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}
ADD murano-base-archive /murano-base-source

10
docker/murano/murano-engine/Dockerfile.j2
View File

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