diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 15:50:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 15:50:39 +0000 |
| commit | ed58ca839a064937023afa1e568d2a1a7b3e042f (patch) | |
| tree | 0f21bd45322308b73a2f92772ed9da4f06629e9a | |
| parent | b1eef791c9cd3793e6db19fce4b5c406c56b57dd (diff) | |
| parent | abcc7d1731609d71cff03a058e899316010d8759 (diff) | |
| download | kolla-ed58ca839a064937023afa1e568d2a1a7b3e042f.tar.gz kolla-ed58ca839a064937023afa1e568d2a1a7b3e042f.zip | |
Merge "Unify Centos and Ubuntu Source Install - Designate"
| -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 %} |