11f65c6c1d
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
54 lines
1.8 KiB
Django/Jinja
54 lines
1.8 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
{% block labels %}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
{% endblock %}
|
|
|
|
{% block glance_base_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{{ macros.configure_user(name='glance') }}
|
|
|
|
{{ macros.enable_extra_repos(['ceph']) }}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set glance_base_packages = [
|
|
'python3-rados',
|
|
'python3-rbd'
|
|
] %}
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set glance_base_packages = [
|
|
'python3-rados',
|
|
'python3-rbd'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(glance_base_packages | customizable("packages")) }}
|
|
|
|
ADD glance-base-archive /glance-base-source
|
|
|
|
{% set glance_base_pip_packages = [
|
|
'/glance',
|
|
'glance_store[cinder,vmware,swift,s3]'
|
|
] %}
|
|
|
|
# add missing rootwrap config present in glance_store repo
|
|
COPY etc/glance /etc/glance
|
|
COPY glance_sudoers /etc/sudoers.d/kolla_glance_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN ln -s glance-base-source/* glance \
|
|
&& {{ macros.install_pip(glance_base_pip_packages | customizable("pip_packages")) }} \
|
|
&& mkdir -p /etc/glance \
|
|
&& cp -r /glance/etc/* /etc/glance/ \
|
|
&& cp /etc/pycadf/glance_api_audit_map.conf /etc/glance/ \
|
|
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/glance/rootwrap.conf \
|
|
&& chmod 750 /etc/sudoers.d \
|
|
&& chmod 440 /etc/sudoers.d/kolla_glance_sudoers \
|
|
&& touch /usr/local/bin/kolla_glance_extend_start \
|
|
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start
|
|
|
|
{{ macros.kolla_patch_sources() }}
|
|
|
|
{% block glance_base_footer %}{% endblock %}
|