Merge "Add build from source and templating for Zaqar"

8 files changed, 68 insertions, 0 deletions

diff --git a/docker/centos/source/zaqar/.buildinfo b/docker/centos/source/zaqar/.buildinfo
new file mode 100644
index 000000000..5f46f8dd7
--- /dev/null
+++ b/docker/centos/source/zaqar/.buildinfo
@@ -0,0 +1,10 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=zaqar
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/zaqar}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/zaqar/zaqar-master.tar.gz}
diff --git a/docker/centos/source/zaqar/Dockerfile b/docker/centos/source/zaqar/Dockerfile
new file mode 100644
index 000000000..3fee08aee
--- /dev/null
+++ b/docker/centos/source/zaqar/Dockerfile
@@ -0,0 +1,20 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./zaqar.tar /
+RUN ln -s /zaqar-* /zaqar
+
+RUN cd /zaqar \
+    && useradd --user-group zaqar \
+    && pip install -r requirements.txt \
+    && pip install /zaqar \
+    && mkdir /etc/zaqar /var/log/zaqar \
+    && cp -r /zaqar/etc/* /etc/zaqar/ \
+    && rm -rf /root/.cache
+
+
+COPY ./start.sh /start.sh
+
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/zaqar/build b/docker/centos/source/zaqar/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/source/zaqar/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/zaqar/config-external.sh b/docker/centos/source/zaqar/config-external.sh
new file mode 120000
index 000000000..38fff40d1
--- /dev/null
+++ b/docker/centos/source/zaqar/config-external.sh
@@ -0,0 +1 @@
+../../../common/zaqar/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/zaqar/start.sh b/docker/centos/source/zaqar/start.sh
new file mode 120000
index 000000000..48134a044
--- /dev/null
+++ b/docker/centos/source/zaqar/start.sh
@@ -0,0 +1 @@
+../../../common/zaqar/start.sh
\ No newline at end of file
diff --git a/docker_templates/zaqar/Dockerfile.j2 b/docker_templates/zaqar/Dockerfile.j2
new file mode 100644
index 000000000..e312f27ad
--- /dev/null
+++ b/docker_templates/zaqar/Dockerfile.j2
@@ -0,0 +1,33 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install openstack-zaqar && yum clean all
+
+    {% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif install_type == 'source' %}
+
+ADD ./zaqar.tar /
+RUN ln -s /zaqar-* /zaqar
+
+RUN cd /zaqar \
+    && useradd --user-group zaqar \
+    && pip install -r requirements.txt \
+    && pip install /zaqar \
+    && mkdir /etc/zaqar /var/log/zaqar \
+    && cp -r /zaqar/etc/* /etc/zaqar/ \
+    && rm -rf /root/.cache
+
+{% endif %}
+
+COPY ./start.sh /start.sh
+
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/zaqar/config-external.sh b/docker_templates/zaqar/config-external.sh
new file mode 120000
index 000000000..412266e05
--- /dev/null
+++ b/docker_templates/zaqar/config-external.sh
@@ -0,0 +1 @@
+../../docker/common/zaqar/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/zaqar/start.sh b/docker_templates/zaqar/start.sh
new file mode 120000
index 000000000..51966e271
--- /dev/null
+++ b/docker_templates/zaqar/start.sh
@@ -0,0 +1 @@
+../../docker/common/zaqar/start.sh
\ No newline at end of file