diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-24 14:47:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-24 14:47:26 +0000 |
| commit | a46978ead4e205e4b37e311633202e97048faad3 (patch) | |
| tree | 9505eaf17ae8bb1c13e2e3b2f6d18b56d64984d0 | |
| parent | 85409731f64598c953a7dcff2f79041aec9c140e (diff) | |
| parent | a5ceb87777ddf38af4c721676dca68eca51c92e6 (diff) | |
| download | kolla-a46978ead4e205e4b37e311633202e97048faad3.tar.gz kolla-a46978ead4e205e4b37e311633202e97048faad3.zip | |
Merge "Ubuntu - Murano"
| -rw-r--r-- | docker_templates/murano/murano-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker_templates/murano/murano-base/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker_templates/murano/murano-engine/Dockerfile.j2 | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/docker_templates/murano/murano-api/Dockerfile.j2 b/docker_templates/murano/murano-api/Dockerfile.j2 index 704743b4d..3136c77ad 100644 --- a/docker_templates/murano/murano-api/Dockerfile.j2 +++ b/docker_templates/murano/murano-api/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY config-external.sh /opt/kolla/ - COPY start.sh / CMD ["/start.sh"] diff --git a/docker_templates/murano/murano-base/Dockerfile.j2 b/docker_templates/murano/murano-base/Dockerfile.j2 index bca9b6d03..bb762dd10 100644 --- a/docker_templates/murano/murano-base/Dockerfile.j2 +++ b/docker_templates/murano/murano-base/Dockerfile.j2 @@ -8,16 +8,16 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} -ADD ./murano.tar / +ADD murano.tar / RUN ln -s /murano-* /murano RUN cd /murano \ + && useradd --user-group murano \ && pip install -r requirements.txt \ - && pip install /murano \ - && mkdir /etc/murano \ - && cd /murano \ - && tox -e genconfig \ - && cp -r etc/murano/* /etc/murano/ \ + && pip install --install-option="--install-scripts=/usr/bin" /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 {% endif %} diff --git a/docker_templates/murano/murano-engine/Dockerfile.j2 b/docker_templates/murano/murano-engine/Dockerfile.j2 index 704743b4d..3136c77ad 100644 --- a/docker_templates/murano/murano-engine/Dockerfile.j2 +++ b/docker_templates/murano/murano-engine/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY config-external.sh /opt/kolla/ - COPY start.sh / CMD ["/start.sh"] |