From 6d84d8616b4c8b1576f3faa2a46723ebec1f5457 Mon Sep 17 00:00:00 2001
From: Shaun Smekel <shaun.smekel@theorem.net.au>
Date: Fri, 12 Aug 2016 06:56:09 +1000
Subject: [PATCH] Customizations for Tgtd
This patchset contains customization of Dockerfile of the Tgtd
container.
Change-Id: I3a9ba82026fb7f596384885360339f67dc10495c
Partially-implements: blueprint third-party-plugin-support
---
docker/tgtd/Dockerfile.j2 | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2
index fbf21ec18..d919ec8da 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 }}
--
GitLab