From 5f5169f0e68028b20f44e0c2261e99dd4c48abf7 Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Thu, 14 Jan 2016 15:33:27 +0100 Subject: [PATCH] Murano ubuntu binary container Change-Id: I059565c15f5b820c5944d5bd349ccbc5acdb7540 Partially-Implements: blueprint binary-ubuntu --- docker/murano/murano-api/Dockerfile.j2 | 10 ++++++++++ docker/murano/murano-base/Dockerfile.j2 | 8 ++++++++ docker/murano/murano-engine/Dockerfile.j2 | 10 ++++++++++ 3 files changed, 28 insertions(+) diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 1074ecce8a..7d57d9c7fd 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -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 diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 6b9fa4b923..ee1337357e 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -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 diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 4c0d9da66a..c3a1557ec0 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -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