diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-23 06:16:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-23 06:16:36 +0000 |
| commit | 606450d5cb159f286ce2761556104968bcdee6a9 (patch) | |
| tree | 8507dbc90cdbcdae0ac418bdbb3f135d88a1ba7c /docker_templates | |
| parent | b6c0be9a7055855328d91e01d144b29a92c9016f (diff) | |
| parent | 4beacffbecbba2aaa806a77ea18eb36d8dad435f (diff) | |
| download | kolla-606450d5cb159f286ce2761556104968bcdee6a9.tar.gz kolla-606450d5cb159f286ce2761556104968bcdee6a9.zip | |
Merge "Fix Glance for Ubuntu"
Diffstat (limited to 'docker_templates')
| -rw-r--r-- | docker_templates/glance/glance-base/Dockerfile.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker_templates/glance/glance-base/Dockerfile.j2 b/docker_templates/glance/glance-base/Dockerfile.j2 index 1a092f1a7..181a78d56 100644 --- a/docker_templates/glance/glance-base/Dockerfile.j2 +++ b/docker_templates/glance/glance-base/Dockerfile.j2 @@ -23,9 +23,10 @@ RUN ln -s /glance-* /glance RUN cd /glance \ && useradd --user-group glance \ && pip install -r requirements.txt \ - && pip install /glance \ - && mkdir /etc/glance /var/log/glance \ + && pip install --install-option="--install-scripts=/usr/bin" /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 {% endif %} |