diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-15 08:44:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-15 08:44:53 +0000 |
| commit | 853bb47d9a66dc91ffa29133af2173c63115a27c (patch) | |
| tree | 62a3a9e7a49c99b4d0ec140679ca639268c5f8a6 /docker | |
| parent | e09e20cdbe0e956765b3ced712d26e5f7a00e75e (diff) | |
| parent | 5f5169f0e68028b20f44e0c2261e99dd4c48abf7 (diff) | |
| download | kolla-853bb47d9a66dc91ffa29133af2173c63115a27c.tar.gz kolla-853bb47d9a66dc91ffa29133af2173c63115a27c.zip | |
Merge "Murano ubuntu binary container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/murano/murano-engine/Dockerfile.j2 | 10 |
3 files changed, 28 insertions, 0 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 1074ecce8..7d57d9c7f 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 6b9fa4b92..ee1337357 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 4c0d9da66..c3a1557ec 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 |