From efd9065d78fd7066421f462db74202a7f16560a9 Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Sat, 23 Jul 2016 15:59:54 +0530
Subject: [PATCH] Customizations for zaqar
This patchset contains customization of Dockerfile
of zaqar containers
Change-Id: I5a493625f4c97563372744dd316b38fc2415e12c
Partially-implements: blueprint third-party-plugin-support
---
docker/zaqar/Dockerfile.j2 | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2
index 0623ce92c0..0d4e9d75d7 100644
--- a/docker/zaqar/Dockerfile.j2
+++ b/docker/zaqar/Dockerfile.j2
@@ -1,21 +1,20 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
-{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
- openstack-zaqar \
- && yum clean all
+{% import "macros.j2" as macros with context %}
- {% elif base_distro in ['ubuntu'] %}
+{% if install_type == 'binary' %}
-RUN apt-get -y install --no-install-recommends \
- zaqar-common \
- zaqar-server \
- && apt-get clean
+{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% set zaqar_packages = ['openstack-zaqar'] %}
+{% elif base_distro in ['ubuntu'] %}
+ {% set zaqar_packages = [
+ 'zaqar-common',
+ 'zaqar-server'
+ ] %}
+{% endif %}
+RUN {{ macros.install_packages(zaqar_packages | customizable("packages")) }}
- {% endif %}
{% elif install_type == 'source' %}
ADD zaqar-archive /zaqar-source
@@ -32,6 +31,8 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \
&& usermod -a -G kolla zaqar
+{% block zaqar_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
USER zaqar
--
GitLab