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/skyline | |
| 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/skyline')
| -rw-r--r-- | docker/skyline/skyline-apiserver/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/skyline/skyline-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/skyline/skyline-console/Dockerfile.j2 | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/docker/skyline/skyline-apiserver/Dockerfile.j2 b/docker/skyline/skyline-apiserver/Dockerfile.j2 index eb59d59de..00c871165 100644 --- a/docker/skyline/skyline-apiserver/Dockerfile.j2 +++ b/docker/skyline/skyline-apiserver/Dockerfile.j2 @@ -19,6 +19,8 @@ RUN ln -s skyline-apiserver-source/* skyline-apiserver \ && {{ macros.install_pip(skyline_apiserver_pip_packages | customizable("pip_packages")) }} \ && chmod 644 /usr/local/bin/kolla_skyline_extend_start +{{ macros.kolla_patch_sources() }} + {% block skyline_apiserver_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/skyline/skyline-base/Dockerfile.j2 b/docker/skyline/skyline-base/Dockerfile.j2 index 23ae13223..0af501e55 100644 --- a/docker/skyline/skyline-base/Dockerfile.j2 +++ b/docker/skyline/skyline-base/Dockerfile.j2 @@ -14,4 +14,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_skyline_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_skyline_extend_start +{{ macros.kolla_patch_sources() }} + {% block skyline_base_footer %}{% endblock %} diff --git a/docker/skyline/skyline-console/Dockerfile.j2 b/docker/skyline/skyline-console/Dockerfile.j2 index 0af0f4b24..fea06a7b6 100644 --- a/docker/skyline/skyline-console/Dockerfile.j2 +++ b/docker/skyline/skyline-console/Dockerfile.j2 @@ -22,6 +22,8 @@ ADD skyline-console-archive /skyline-console-source RUN ln -s skyline-console-source/* skyline-console \ && {{ macros.install_pip(skyline_console_pip_packages | customizable("pip_packages")) }} +{{ macros.kolla_patch_sources() }} + {% block skyline_console_footer %}{% endblock %} {% block footer %}{% endblock %} |