diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 16:29:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 16:29:55 +0000 |
| commit | 650fe37921479c26c1f02b98d89953bd083b8d0c (patch) | |
| tree | 43222126c4ffc792b0d6f79510fa3d1c7ccd25c7 | |
| parent | 71ff1834c0655588e6ed8b00397d6013127ffde0 (diff) | |
| parent | 5b0aef1f3dced248ccaa07fe1e5ffbc6897d83b9 (diff) | |
| download | kolla-650fe37921479c26c1f02b98d89953bd083b8d0c.tar.gz kolla-650fe37921479c26c1f02b98d89953bd083b8d0c.zip | |
Merge "Unify Centos and Ubuntu Source Install - Zaqar"
| -rw-r--r-- | docker_templates/zaqar/Dockerfile.j2 | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/docker_templates/zaqar/Dockerfile.j2 b/docker_templates/zaqar/Dockerfile.j2 index ee312dd56..fd4752f78 100644 --- a/docker_templates/zaqar/Dockerfile.j2 +++ b/docker_templates/zaqar/Dockerfile.j2 @@ -14,21 +14,17 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} -ADD ./zaqar.tar / -RUN ln -s /zaqar-* /zaqar - -RUN cd /zaqar \ +ADD zaqar.tar / +RUN ln -s /zaqar-* zaqar \ && useradd --user-group zaqar \ - && pip install -r requirements.txt \ - && pip install /zaqar \ - && mkdir /etc/zaqar /var/log/zaqar \ + && pip --no-cache-dir install /zaqar \ + && mkdir -p /etc/zaqar /var/log/zaqar /home/zaqar \ && cp -r /zaqar/etc/* /etc/zaqar/ \ - && rm -rf /root/.cache + && chown -R zaqar: /etc/zaqar /var/log/zaqar /home/zaqar {% endif %} -COPY ./start.sh /start.sh - +COPY start.sh / COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] |