Merge "Add zookeeper image"

2 files changed, 37 insertions, 0 deletions

diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2
new file mode 100644
index 000000000..3693d13f2
--- /dev/null
+++ b/docker/zookeeper/Dockerfile.j2
@@ -0,0 +1,28 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block zookeeper_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif base_distro in ['ubuntu', 'debian'] %}
+    {% set zookeeper_packages = [
+        'zookeeper',
+    ] %}
+{% endif %}
+
+{{ macros.install_packages(zookeeper_packages | customizable("packages")) }}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start \
+    && usermod -a -G kolla zookeeper
+
+{% block zookeeper_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER zookeeper
diff --git a/docker/zookeeper/extend_start.sh b/docker/zookeeper/extend_start.sh
new file mode 100644
index 000000000..d61fc9e64
--- /dev/null
+++ b/docker/zookeeper/extend_start.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Create log directory, with appropriate permissions
+if [[ ! -d "/var/log/kolla/zookeeper" ]]; then
+    mkdir -p /var/log/kolla/zookeeper
+fi
+if [[ $(stat -c %a /var/log/kolla/zookeeper) != "755" ]]; then
+    chmod 755 /var/log/kolla/zookeeper
+fi