diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index fbf21ec189486033fc616f7656f2d62058231400..d919ec8da2058b5fd2044e276d52bde539c819a0 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -1,22 +1,22 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +{% import "macros.j2" as macros with context %} -RUN yum -y install \ - scsi-target-utils \ - && yum clean all +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% set tgtd_packages = ['scsi-target-utils'] %} +RUN {{ macros.install_packages(tgtd_packages | customizable("packages")) }} RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% elif base_distro in ['ubuntu', 'debian'] %} + {% set tgtd_packages = ['tgt'] %} -RUN apt-get -y install --no-install-recommends \ - tgt \ - && apt-get clean - +RUN {{ macros.install_packages(tgtd_packages | customizable("packages")) }} RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% endif %} +{% block tgtd_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }}