a9d08726f5
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
56 lines
1.4 KiB
Django/Jinja
56 lines
1.4 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% 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
|