diff options
| author | Michal Arbet <michal.arbet@ultimum.io> | 2022-02-15 13:50:59 +0100 |
|---|---|---|
| committer | Dr. Jens Harbott <harbott@osism.tech> | 2024-11-15 08:04:30 +0000 |
| commit | 11f65c6c1d3bfd6a12f8e71d778d46d635010449 (patch) | |
| tree | 8e223ecd5f90c5142cdb70b88f4e2400136fcd9d /docker/cinder | |
| parent | 36c12676ff185f524a7f4d2f2f4c70b5d60462b4 (diff) | |
| download | kolla-11f65c6c1d3bfd6a12f8e71d778d46d635010449.tar.gz kolla-11f65c6c1d3bfd6a12f8e71d778d46d635010449.zip | |
Add mechanism for patching files in containers
This patch adds a way to patch files in a Docker
image built by Kolla. This is very useful for several
reasons, specifically:
- Custom modifications
- The stable branch of some library has a fix but no pip
package has been released
- Eliminates the need to package your own pip packages
- Eliminates the need to invent your own versioning to prevent
upstream versioning
- Eliminates the need to manage a pip server
- In other words, it eliminates the need to get a wheel into
the image and install it manually using any method not
previously mentioned
It is also highly desirable because, although Kolla can replace
the source for a service with a custom URL for a tarball or its
own Git repo, it cannot do this for dependencies pulled from pip.
I would also like to point out that this is a feature with its own
code path and works only if the user "inserts" a patch into the folder
patches/docker-image/something.patch and creates an analogous series
file for patch source code.
Simply said, this code will never interfere with the upstream build process
since this feature is not intended for use in upstream.
It is rather meant for downstream users who know what they are doing.
Now they just have an option to patch their images.
Everything works on all layers of the Docker image and stores a report
of applied patches which can then be seen in /etc.
This mechanism is similar as debian patch quilt.
Change-Id: I61d0790c5d4d070b7ea9e8c99c0a76ff5d22bf9d
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-backup/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-scheduler/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 34f684a80..b26bbf6e5 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -19,5 +19,7 @@ RUN mkdir -p /var/www/cgi-bin/cinder \ && chmod 644 /usr/local/bin/kolla_cinder_extend_start \ && chmod 755 /var/www/cgi-bin/cinder/cinder-wsgi +{{ macros.kolla_patch_sources() }} + {% block cinder_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 2c6314bdd..aaa8a344f 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -25,6 +25,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(cinder_backup_packages | customizable("packages")) }} +{{ macros.kolla_patch_sources() }} + {% block cinder_backup_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 4446dcf0e..d7ba7612a 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -51,4 +51,6 @@ RUN ln -s cinder-base-source/* cinder \ && touch /usr/local/bin/kolla_cinder_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start +{{ macros.kolla_patch_sources() }} + {% block cinder_base_footer %}{% endblock %} diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index 15e7bc8f4..d1835092e 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.kolla_patch_sources() }} + {% block cinder_scheduler_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 9954e92ed..5b36b6503 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -52,6 +52,8 @@ RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_cinder_volume_sudoers \ && chmod 644 /usr/local/bin/kolla_cinder_extend_start +{{ macros.kolla_patch_sources() }} + {% block cinder_volume_footer %}{% endblock %} {% block footer %}{% endblock %} |
