diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 10:39:44 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 11:09:37 +0000 |
| commit | 5b0aef1f3dced248ccaa07fe1e5ffbc6897d83b9 (patch) | |
| tree | 4837b8f74636782df1e19be5a069afff663f5ece | |
| parent | eecf6581a47745d53298c4efa5af6c411afa6260 (diff) | |
| download | kolla-5b0aef1f3dced248ccaa07fe1e5ffbc6897d83b9.tar.gz kolla-5b0aef1f3dced248ccaa07fe1e5ffbc6897d83b9.zip | |
Unify Centos and Ubuntu Source Install - Zaqar
A change merged in the base allows for Centos and Ubuntu to install
all python things to the same locations. This updates the source
section to reflect that change.
Change-Id: I6b66fad8c06416f6b9f17348301dcb1e91fe50cd
Partially-Implements: blueprint install-from-ubuntu
| -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"] |