aboutsummaryrefslogtreecommitdiff
path: root/kolla/docker/glance
diff options
context:
space:
mode:
Diffstat (limited to 'kolla/docker/glance')
-rw-r--r--kolla/docker/glance/glance-api/Dockerfile.j23
-rw-r--r--kolla/docker/glance/glance-base/Dockerfile.j25
2 files changed, 7 insertions, 1 deletions
diff --git a/kolla/docker/glance/glance-api/Dockerfile.j2 b/kolla/docker/glance/glance-api/Dockerfile.j2
index e3efbfef3..ca1820631 100644
--- a/kolla/docker/glance/glance-api/Dockerfile.j2
+++ b/kolla/docker/glance/glance-api/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{% if base_package_type == 'rpm' %}
{% set glance_api_packages = [
'lsscsi',
@@ -34,5 +36,6 @@ RUN chmod 644 /usr/local/bin/kolla_glance_extend_start
{% block glance_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
USER glance
diff --git a/kolla/docker/glance/glance-base/Dockerfile.j2 b/kolla/docker/glance/glance-base/Dockerfile.j2
index 885cc4353..59402e663 100644
--- a/kolla/docker/glance/glance-base/Dockerfile.j2
+++ b/kolla/docker/glance/glance-base/Dockerfile.j2
@@ -7,11 +7,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{{ macros.configure_user(name='glance') }}
{% if base_package_type == 'rpm' %}
-{{ macros.enable_extra_repos(['ceph', 'epel']) }}
+{{ macros.enable_extra_repos(['ceph', 'crb', 'epel']) }}
{% set glance_base_packages = [
'python3-rados',
@@ -52,3 +54,4 @@ RUN ln -s glance-base-source/* glance \
{{ macros.kolla_patch_sources() }}
{% block glance_base_footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}