summaryrefslogtreecommitdiff
path: root/docker/glance
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-31 15:57:26 +0000
committerGerrit Code Review <review@openstack.org>2015-12-31 15:57:26 +0000
commitbf21fba7e31f9fe39cfbe90da905b09bac02f937 (patch)
tree3f48130b130d2c484fd5500807547865f68eacf9 /docker/glance
parentd6c77c7d868aa850e849d0813fa4f1441972d527 (diff)
parent7cc7ecdadeec4cbba8bf54700eb9b566c8f7a602 (diff)
downloadkolla-bf21fba7e31f9fe39cfbe90da905b09bac02f937.tar.gz
kolla-bf21fba7e31f9fe39cfbe90da905b09bac02f937.zip
Merge "Glance ubuntu binary container"
Diffstat (limited to 'docker/glance')
-rw-r--r--docker/glance/glance-base/Dockerfile.j212
1 files changed, 12 insertions, 0 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index 8a893ad02..bb310fef8 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-base/Dockerfile.j2
@@ -14,6 +14,18 @@ RUN yum -y install \
&& yum clean all \
&& mkdir -p /etc/ceph/
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ glance \
+ python-oslo-i18n \
+ python-castellan \
+ python-cryptography \
+ python-rbd \
+ python-rados \
+ && apt-get clean \
+ && mkdir -p /etc/ceph/
+
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}