diff options
| author | MD NADEEM <mail2nadeem92@gmail.com> | 2016-03-01 10:28:34 +0530 |
|---|---|---|
| committer | MD NADEEM <mail2nadeem92@gmail.com> | 2016-03-17 17:19:01 +0530 |
| commit | d4a5c75db6896d1b5aac25f64b26bd4ed291ee14 (patch) | |
| tree | 92dac80545491b3fd23e695e4fa179287dc64c96 /docker | |
| parent | a42fd0c0d2ca550dba9228bf31d4237ea8d2faf6 (diff) | |
| download | kolla-d4a5c75db6896d1b5aac25f64b26bd4ed291ee14.tar.gz kolla-d4a5c75db6896d1b5aac25f64b26bd4ed291ee14.zip | |
Manila ubuntu binary container
manila-share is present in manila-common package.
Change-Id: Ida231c0468b6ee3bb6a76fb9f475724abf95c1cb
Closes-Bug:#1553199
Diffstat (limited to 'docker')
| -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 |