diff options
| author | Zuul <zuul@review.opendev.org> | 2024-11-15 12:09:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-11-15 12:09:58 +0000 |
| commit | dca8462bc491a93c6a6ae71e86d59a2dcb804ff5 (patch) | |
| tree | bc41637caaa762e5dce1452c16d3b5f52f3cbf96 /docker/ironic | |
| parent | 68fa7d302095b5362f176b7e690e3cbaa516fae0 (diff) | |
| parent | 11f65c6c1d3bfd6a12f8e71d778d46d635010449 (diff) | |
| download | kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.tar.gz kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.zip | |
Merge "Add mechanism for patching files in containers"
Diffstat (limited to 'docker/ironic')
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index b88d579b3..a2406fb83 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -14,5 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start +{{ macros.kolla_patch_sources() }} + {% block ironic_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 4b4681b67..a468a2b32 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -29,4 +29,6 @@ RUN ln -s ironic-base-source/* ironic \ && touch /usr/local/bin/kolla_ironic_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ironic_extend_start +{{ macros.kolla_patch_sources() }} + {% block ironic_base_footer %}{% endblock %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 8d3d3c7af..0309a9dd4 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -66,6 +66,8 @@ RUN {{ macros.install_pip(ironic_conductor_pip_packages | customizable("pip_pack {{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }} +{{ macros.kolla_patch_sources() }} + {% block ironic_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 index dab4b397c..7f3a1cd9d 100644 --- a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 +++ b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 @@ -37,5 +37,7 @@ ENV IRONIC_CONFIG /etc/ironic/ironic.conf COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start +{{ macros.kolla_patch_sources() }} + {% block ironic_prometheus_exporter_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index d122e1b11..51588ac61 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -49,5 +49,7 @@ COPY tftp-map-file-template /map-file-template COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start +{{ macros.kolla_patch_sources() }} + {% block ironic_pxe_footer %}{% endblock %} {% block footer %}{% endblock %} |
