b41247c656
Change needed to add header blocks to all Dockerfiles, similar to the base. Use case is to easily run something before packages are installed, e.g. to COPY a local rpm in that can be added to the package list. Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee Closes-Bug: 1618969
58 lines
1.5 KiB
Django/Jinja
58 lines
1.5 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% block cinder_volume_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
{% set cinder_volume_packages = [
|
|
'scsi-target-utils'
|
|
] %}
|
|
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
|
|
{% block cinder_volume_redhat_setup %}
|
|
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
|
|
{% endblock %}
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
{% set cinder_volume_packages = [
|
|
'tgt'
|
|
] %}
|
|
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
|
|
{% block cinder_volume_ubuntu_setup %}
|
|
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
|
|
{% endblock %}
|
|
|
|
{% endif %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
{% set cinder_volume_packages = [
|
|
'cinder-volume'
|
|
] %}
|
|
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
COPY cinder_sudoers /etc/sudoers.d/cinder_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN chmod 750 /etc/sudoers.d \
|
|
&& chmod 440 /etc/sudoers.d/cinder_sudoers \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start
|
|
|
|
{% block cinder_volume_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
{{ include_footer }}
|
|
|
|
USER cinder
|