diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 13:20:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 13:20:34 +0000 |
| commit | 14d706da4e63e3d96fec8d97a27477de0199861b (patch) | |
| tree | 8d35eeadd0461afc4fd9cdf78feb84b182b376b9 | |
| parent | 5fe9c059e0d73f10d3e76b61fcc81524adb3474d (diff) | |
| parent | 2eac7ab9cef18134f435b7e47cbdc81611fbbac1 (diff) | |
| download | kolla-14d706da4e63e3d96fec8d97a27477de0199861b.tar.gz kolla-14d706da4e63e3d96fec8d97a27477de0199861b.zip | |
Merge "Unify Centos and Ubuntu Source Install - Glance"
| -rw-r--r-- | docker_templates/glance/glance-base/Dockerfile.j2 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docker_templates/glance/glance-base/Dockerfile.j2 b/docker_templates/glance/glance-base/Dockerfile.j2 index 181a78d56..8fad82106 100644 --- a/docker_templates/glance/glance-base/Dockerfile.j2 +++ b/docker_templates/glance/glance-base/Dockerfile.j2 @@ -17,16 +17,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} -ADD ./glance.tar / -RUN ln -s /glance-* /glance - -RUN cd /glance \ +ADD glance.tar / +RUN ln -s /glance-* glance \ && useradd --user-group glance \ - && pip install -r requirements.txt \ - && pip install --install-option="--install-scripts=/usr/bin" /glance \ + && pip --no-cache-dir install /glance \ && mkdir -p /etc/glance /var/log/glance /home/glance \ && cp -r /glance/etc/* /etc/glance/ \ - && chown -R glance: /etc/glance /var/log/glance /home/glance \ - && rm -rf /root/.cache + && chown -R glance: /etc/glance /var/log/glance /home/glance {% endif %} |