aboutsummaryrefslogtreecommitdiff
path: root/docker_templates
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-22 10:51:52 +0000
committerSam Yaple <sam@yaple.net>2015-08-22 11:07:26 +0000
commit4beacffbecbba2aaa806a77ea18eb36d8dad435f (patch)
tree372553fa5c12e5209dee936b3bc8acfc0e5e19ed /docker_templates
parentf70e8d4598c58f8b2904542f7e0d87c693f70761 (diff)
downloadkolla-4beacffbecbba2aaa806a77ea18eb36d8dad435f.tar.gz
kolla-4beacffbecbba2aaa806a77ea18eb36d8dad435f.zip
Fix Glance for Ubuntu
Change-Id: Ie442b60fbaadcb83fca060b811e95c07c773c8b8 Partially-Implements: blueprint install-from-ubuntu
Diffstat (limited to 'docker_templates')
-rw-r--r--docker_templates/glance/glance-base/Dockerfile.j25
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 %}