diff options
Diffstat (limited to 'kolla/docker/ironic')
| -rw-r--r-- | kolla/docker/ironic/ironic-api/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/docker/ironic/ironic-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/docker/ironic/ironic-conductor/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/docker/ironic/ironic-pxe-filter/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/docker/ironic/ironic-pxe/Dockerfile.j2 | 3 |
5 files changed, 15 insertions, 0 deletions
diff --git a/kolla/docker/ironic/ironic-api/Dockerfile.j2 b/kolla/docker/ironic/ironic-api/Dockerfile.j2 index 1c10d0372..f5337f04a 100644 --- a/kolla/docker/ironic/ironic-api/Dockerfile.j2 +++ b/kolla/docker/ironic/ironic-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 ironic_api_packages = [ ] %} {{ macros.install_packages(ironic_api_packages | customizable("packages")) }} @@ -18,3 +20,4 @@ RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start {% block ironic_api_footer %}{% endblock %} {% block footer %}{% endblock %} +{{ macros.kolla_cleanup_repos() }} diff --git a/kolla/docker/ironic/ironic-base/Dockerfile.j2 b/kolla/docker/ironic/ironic-base/Dockerfile.j2 index 39265cf80..7696d2911 100644 --- a/kolla/docker/ironic/ironic-base/Dockerfile.j2 +++ b/kolla/docker/ironic/ironic-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='ironic', shell='/bin/bash') }} ADD ironic-base-archive /ironic-base-source @@ -30,3 +32,4 @@ RUN ln -s ironic-base-source/* ironic \ {{ macros.kolla_patch_sources() }} {% block ironic_base_footer %}{% endblock %} +{{ macros.kolla_cleanup_repos() }} diff --git a/kolla/docker/ironic/ironic-conductor/Dockerfile.j2 b/kolla/docker/ironic/ironic-conductor/Dockerfile.j2 index 15a07e4b9..40525b620 100644 --- a/kolla/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/kolla/docker/ironic/ironic-conductor/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 ironic_conductor_packages = [ 'dosfstools', @@ -71,5 +73,6 @@ RUN {{ macros.install_pip(ironic_conductor_pip_packages | customizable("pip_pack {% block ironic_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} +{{ macros.kolla_cleanup_repos() }} USER ironic diff --git a/kolla/docker/ironic/ironic-pxe-filter/Dockerfile.j2 b/kolla/docker/ironic/ironic-pxe-filter/Dockerfile.j2 index 5b593e9f0..717c7849c 100644 --- a/kolla/docker/ironic/ironic-pxe-filter/Dockerfile.j2 +++ b/kolla/docker/ironic/ironic-pxe-filter/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 ironic_pxe_filter_packages = [] %} {% set ironic_pxe_filter_pip_packages = [] %} @@ -22,3 +24,4 @@ RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start {% block ironic_pxe_filter_footer %}{% endblock %} {% block footer %}{% endblock %} +{{ macros.kolla_cleanup_repos() }} diff --git a/kolla/docker/ironic/ironic-pxe/Dockerfile.j2 b/kolla/docker/ironic/ironic-pxe/Dockerfile.j2 index 0475a5b05..f198e3292 100644 --- a/kolla/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/kolla/docker/ironic/ironic-pxe/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 ironic_pxe_packages = [ 'dosfstools', @@ -53,3 +55,4 @@ RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start {% block ironic_pxe_footer %}{% endblock %} {% block footer %}{% endblock %} +{{ macros.kolla_cleanup_repos() }} |
