diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/tgtd/Dockerfile.j2 | 7 |
3 files changed, 17 insertions, 5 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 119b043b1..6a7ea3f33 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -236,7 +236,6 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ 'lvm2', 'ncurses', 'procps-ng', - 'scsi-target-utils', 'socat', 'sudo', 'which' @@ -250,6 +249,11 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ 'python' ] %} {% endif %} +{% if distro_package_manager == 'yum' %} + {% set base_centos_binary_packages = base_centos_binary_packages + [ + 'scsi-target-utils', + ] %} +{% endif %} # Install base packages {{ macros.install_packages( base_centos_binary_packages | customizable("centos_binary_packages")) }} @@ -266,12 +270,16 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ 'lvm2', 'ncurses', 'procps-ng', - 'scsi-target-utils', 'socat', 'sudo', 'tar', 'which' ] %} +{% if distro_package_manager == 'yum' %} + {% set base_centos_source_packages = base_centos_source_packages + [ + 'scsi-target-utils', + ] %} +{% endif %} # Update packages {{ macros.install_packages( base_centos_source_packages | customizable("centos_source_packages")) }} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index c6f07ec29..a65718bbc 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -9,7 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set cinder_volume_packages = [ 'nfs-utils', 'nvmetcli', - 'scsi-target-utils', 'sysfsutils', 'targetcli' ] %} @@ -26,7 +25,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {% block cinder_volume_redhat_setup %} +{% if distro_package_manager == 'yum' %} RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf +{% endif %} {% endblock %} {% elif base_package_type == 'deb' %} diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index 48f7dc4b1..a2f322247 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -6,10 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if base_package_type == 'rpm' %} - {% set tgtd_packages = ['scsi-target-utils'] %} -{{ macros.install_packages(tgtd_packages | customizable("packages")) }} +{% if distro_package_manager == 'dnf' %} +RUN echo 'Not available for {{ base_distro }}' \ + && /bin/false +{% else %} RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf +{% endif %} {% elif base_package_type == 'deb' %} {% set tgtd_packages = ['tgt'] %} |
