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
31 lines
804 B
Django/Jinja
31 lines
804 B
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
{% set iscsid_packages = [
|
|
'iscsi-initiator-utils',
|
|
'targetcli',
|
|
'python-rtslib'
|
|
] %}
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
{% set iscsid_packages = [
|
|
'open-iscsi',
|
|
'targetcli',
|
|
'python-rtslib'
|
|
] %}
|
|
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(iscsid_packages | customizable("packages")) }}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_extend_start \
|
|
&& rm /etc/iscsi/initiatorname.iscsi
|
|
|
|
{% block iscsid_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
{{ include_footer }}
|