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/cyborg | |
| 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/cyborg')
| -rw-r--r-- | docker/cyborg/cyborg-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-conductor/Dockerfile.j2 | 4 |
4 files changed, 10 insertions, 0 deletions
diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2 index 8d26fbcb7..222be13dc 100644 --- a/docker/cyborg/cyborg-agent/Dockerfile.j2 +++ b/docker/cyborg/cyborg-agent/Dockerfile.j2 @@ -16,5 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build RUN {{ macros.install_pip(cyborg_agent_pip_packages | customizable("pip_packages")) }} +{{ macros.kolla_patch_sources() }} + {% block cyborg_agent_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index 235bdb47a..f087e572d 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -13,5 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start RUN chmod 644 /usr/local/bin/kolla_cyborg_extend_start +{{ macros.kolla_patch_sources() }} + {% block cyborg_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 4b6af0811..a0b3a4566 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -26,4 +26,6 @@ RUN ln -s cyborg-base-source/* cyborg \ && touch /usr/local/bin/kolla_cyborg_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start +{{ macros.kolla_patch_sources() }} + {% block cyborg_footer %}{% endblock %} diff --git a/docker/cyborg/cyborg-conductor/Dockerfile.j2 b/docker/cyborg/cyborg-conductor/Dockerfile.j2 index 51e562ca0..aeff1c7ed 100644 --- a/docker/cyborg/cyborg-conductor/Dockerfile.j2 +++ b/docker/cyborg/cyborg-conductor/Dockerfile.j2 @@ -5,5 +5,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block cyborg_conductor_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + +{{ macros.kolla_patch_sources() }} + {% block cyborg_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} |