aboutsummaryrefslogtreecommitdiff
path: root/kolla/docker/cyborg
diff options
context:
space:
mode:
Diffstat (limited to 'kolla/docker/cyborg')
-rw-r--r--kolla/docker/cyborg/cyborg-agent/Dockerfile.j23
-rw-r--r--kolla/docker/cyborg/cyborg-api/Dockerfile.j23
-rw-r--r--kolla/docker/cyborg/cyborg-base/Dockerfile.j23
3 files changed, 9 insertions, 0 deletions
diff --git a/kolla/docker/cyborg/cyborg-agent/Dockerfile.j2 b/kolla/docker/cyborg/cyborg-agent/Dockerfile.j2
index dfc1adc0b..e8b5d9c3c 100644
--- a/kolla/docker/cyborg/cyborg-agent/Dockerfile.j2
+++ b/kolla/docker/cyborg/cyborg-agent/Dockerfile.j2
@@ -6,6 +6,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% block cyborg_agent_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{% set cyborg_agent_packages = [
'pciutils',
] %}
@@ -20,3 +22,4 @@ RUN {{ macros.install_pip(cyborg_agent_pip_packages | customizable("pip_packages
{% block cyborg_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/cyborg/cyborg-api/Dockerfile.j2 b/kolla/docker/cyborg/cyborg-api/Dockerfile.j2
index d67cdeb28..ba4e6f209 100644
--- a/kolla/docker/cyborg/cyborg-api/Dockerfile.j2
+++ b/kolla/docker/cyborg/cyborg-api/Dockerfile.j2
@@ -6,6 +6,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% block cyborg_api_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{% set cyborg_api_packages = [
] %}
{{ macros.install_packages(cyborg_api_packages | customizable("packages")) }}
@@ -17,3 +19,4 @@ RUN chmod 644 /usr/local/bin/kolla_cyborg_extend_start
{% block cyborg_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/cyborg/cyborg-base/Dockerfile.j2 b/kolla/docker/cyborg/cyborg-base/Dockerfile.j2
index c3f3e602a..95a0eab8c 100644
--- a/kolla/docker/cyborg/cyborg-base/Dockerfile.j2
+++ b/kolla/docker/cyborg/cyborg-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='cyborg') }}
ADD cyborg-base-archive /cyborg-base-source
@@ -29,3 +31,4 @@ RUN ln -s cyborg-base-source/* cyborg \
{{ macros.kolla_patch_sources() }}
{% block cyborg_footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}