diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-17 15:45:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-17 15:45:12 +0000 |
| commit | bbe08628d025d63354087c7a514f4d6038e6a94c (patch) | |
| tree | a43ff75b592e897eca585c6913b57e9cce7f6622 | |
| parent | 264e90885dc719449a8e565824d737693791e1dd (diff) | |
| parent | d4a5c75db6896d1b5aac25f64b26bd4ed291ee14 (diff) | |
| download | kolla-bbe08628d025d63354087c7a514f4d6038e6a94c.tar.gz kolla-bbe08628d025d63354087c7a514f4d6038e6a94c.zip | |
Merge "Manila ubuntu binary container"
| -rw-r--r-- | docker/manila/manila-api/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/manila/manila-scheduler/Dockerfile.j2 | 10 |
3 files changed, 21 insertions, 0 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 3590103a9..88269d2c8 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -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 diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index 83069c1f3..d971b7c86 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -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 diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index a3ca1820b..2fd2f0a69 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/docker/manila/manila-scheduler/Dockerfile.j2 @@ -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 |