diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 10:28:31 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 11:14:41 +0000 |
| commit | abcc7d1731609d71cff03a058e899316010d8759 (patch) | |
| tree | a9e96a1115fb32a7cb8a28b1061ac02363668292 /docker_templates | |
| parent | eecf6581a47745d53298c4efa5af6c411afa6260 (diff) | |
| download | kolla-abcc7d1731609d71cff03a058e899316010d8759.tar.gz kolla-abcc7d1731609d71cff03a058e899316010d8759.zip | |
Unify Centos and Ubuntu Source Install - Designate
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: I83b0d2ca2735b0b6b0b94d67f4ab301b92ef1e0a
Partially-Implements: blueprint install-from-ubuntu
Diffstat (limited to 'docker_templates')
| -rw-r--r-- | docker_templates/designate/designate-base/Dockerfile.j2 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/docker_templates/designate/designate-base/Dockerfile.j2 b/docker_templates/designate/designate-base/Dockerfile.j2 index 4aa05f47c..3fec3a6f7 100644 --- a/docker_templates/designate/designate-base/Dockerfile.j2 +++ b/docker_templates/designate/designate-base/Dockerfile.j2 @@ -26,15 +26,12 @@ RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} -ADD ./designate.tar / -RUN ln -s /designate-* /designate - -RUN cd /designate \ +ADD designate.tar / +RUN ln -s /designate-* designate \ && useradd --user-group designate \ - && pip install -r requirements.txt \ - && pip install /designate \ - && mkdir /etc/designate /var/log/designate \ + && pip --no-cache-dir install /designate \ + && mkdir -p /etc/designate /var/log/designate /home/designate \ && cp -r /designate/etc/designate/* /etc/designate/ \ - && rm -rf /root/.cache + && chown -R designate: /etc/designate /var/log/designate /home/designate {% endif %} |