aboutsummaryrefslogtreecommitdiff
path: root/kolla/docker/manila
diff options
context:
space:
mode:
Diffstat (limited to 'kolla/docker/manila')
-rw-r--r--kolla/docker/manila/manila-api/Dockerfile.j23
-rw-r--r--kolla/docker/manila/manila-base/Dockerfile.j23
-rw-r--r--kolla/docker/manila/manila-data/Dockerfile.j23
-rw-r--r--kolla/docker/manila/manila-share/Dockerfile.j26
4 files changed, 15 insertions, 0 deletions
diff --git a/kolla/docker/manila/manila-api/Dockerfile.j2 b/kolla/docker/manila/manila-api/Dockerfile.j2
index d7b75d388..ea5f46195 100644
--- a/kolla/docker/manila/manila-api/Dockerfile.j2
+++ b/kolla/docker/manila/manila-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() }}
+
{% set manila_api_packages = [
] %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }}
@@ -19,5 +21,6 @@ RUN chmod 644 /usr/local/bin/kolla_manila_extend_start
{% block manila_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
USER manila
diff --git a/kolla/docker/manila/manila-base/Dockerfile.j2 b/kolla/docker/manila/manila-base/Dockerfile.j2
index a236a20df..fff2d5bd3 100644
--- a/kolla/docker/manila/manila-base/Dockerfile.j2
+++ b/kolla/docker/manila/manila-base/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{{ macros.configure_user(name='manila') }}
{% if base_package_type == 'rpm' %}
@@ -46,3 +48,4 @@ RUN ln -s manila-base-source/* manila \
{{ macros.kolla_patch_sources() }}
{% block manila_base_footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/manila/manila-data/Dockerfile.j2 b/kolla/docker/manila/manila-data/Dockerfile.j2
index 06e1d9dc9..f0454c122 100644
--- a/kolla/docker/manila/manila-data/Dockerfile.j2
+++ b/kolla/docker/manila/manila-data/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 manila_data_packages = [
@@ -27,5 +29,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% block manila_data_footer %}{% endblock %}
{% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
USER manila
diff --git a/kolla/docker/manila/manila-share/Dockerfile.j2 b/kolla/docker/manila/manila-share/Dockerfile.j2
index 161b6865a..f5bc29bb7 100644
--- a/kolla/docker/manila/manila-share/Dockerfile.j2
+++ b/kolla/docker/manila/manila-share/Dockerfile.j2
@@ -7,7 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['crb']) }}
+
{% set manila_share_packages = [
'ceph-common',
'sqlite',
@@ -30,5 +35,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% block manila_share_footer %}{% endblock %}
{% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
USER manila