diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 16:07:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 16:07:16 +0000 |
| commit | 71ff1834c0655588e6ed8b00397d6013127ffde0 (patch) | |
| tree | a2b5d3deea6b2e4ea6b7ecca69a414ae8e1e39a3 | |
| parent | 12a21ed6efb2254314888c591bfbe86ad4e0c725 (diff) | |
| parent | 94664283aa219eb8cab6a29d5001f758c3d9f40e (diff) | |
| download | kolla-71ff1834c0655588e6ed8b00397d6013127ffde0.tar.gz kolla-71ff1834c0655588e6ed8b00397d6013127ffde0.zip | |
Merge "Unify Centos and Ubuntu Source Install - Murano"
| -rw-r--r-- | docker_templates/murano/murano-base/Dockerfile.j2 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/docker_templates/murano/murano-base/Dockerfile.j2 b/docker_templates/murano/murano-base/Dockerfile.j2 index bb762dd10..cb700e5e0 100644 --- a/docker_templates/murano/murano-base/Dockerfile.j2 +++ b/docker_templates/murano/murano-base/Dockerfile.j2 @@ -9,15 +9,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} ADD murano.tar / -RUN ln -s /murano-* /murano - -RUN cd /murano \ +RUN ln -s /murano-* murano \ && useradd --user-group murano \ - && pip install -r requirements.txt \ - && pip install --install-option="--install-scripts=/usr/bin" /murano \ + && pip --no-cache-dir install /murano \ && mkdir -p /etc/murano /var/log/murano /home/murano \ && cp -r /murano/etc/murano/* /etc/murano/ \ - && chown -R murano: /etc/murano /var/log/murano /home/murano \ - && rm -rf /root/.cache + && chown -R murano: /etc/murano /var/log/murano /home/murano {% endif %} |