5 files changed, 90 insertions, 0 deletions
diff --git a/docker/blazar/blazar-api/Dockerfile.j2 b/docker/blazar/blazar-api/Dockerfile.j2
new file mode 100644
index 000000000..9ad121407
--- /dev/null
+++ b/docker/blazar/blazar-api/Dockerfile.j2
@@ -0,0 +1,19 @@
+FROM {{ namespace }}/{{ image_prefix }}blazar-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block blazar_api_header %}{% endblock %}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% endif %}
+
+COPY extend_start.sh /usr/local/bin/kolla_blazar_extend_start
+RUN chmod 755 /usr/local/bin/kolla_blazar_extend_start
+
+{% block blazar_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER blazar
diff --git a/docker/blazar/blazar-api/extend_start.sh b/docker/blazar/blazar-api/extend_start.sh
new file mode 100644
index 000000000..ff4f2b801
--- /dev/null
+++ b/docker/blazar/blazar-api/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    blazar-db-manage --config-file /etc/blazar/blazar.conf upgrade head
+    exit 0
+fi
diff --git a/docker/blazar/blazar-base/Dockerfile.j2 b/docker/blazar/blazar-base/Dockerfile.j2
new file mode 100644
index 000000000..0a31243b5
--- /dev/null
+++ b/docker/blazar/blazar-base/Dockerfile.j2
@@ -0,0 +1,37 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block blazar_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='blazar') }}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif install_type == 'source' %}
+
+ADD blazar-base-archive /blazar-base-source
+
+{% set blazar_base_pip_packages = [
+    '/blazar'
+] %}
+
+RUN ln -s blazar-base-source/* blazar \
+    && {{ macros.install_pip(blazar_base_pip_packages | customizable("pip_packages")) }} \
+    && mkdir -p /etc/blazar \
+    && cp -r /blazar/etc/blazar/* /etc/blazar \
+    && cp /blazar/etc/policy.json /etc/blazar \
+    && chown -R blazar: /etc/blazar
+
+{% endif %}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN touch /usr/local/bin/kolla_blazar_extend_start \
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_blazar_extend_start
+
+{% block blazar_base_footer %}{% endblock %}
diff --git a/docker/blazar/blazar-base/extend_start.sh b/docker/blazar/blazar-base/extend_start.sh
new file mode 100644
index 000000000..a96a4c113
--- /dev/null
+++ b/docker/blazar/blazar-base/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/blazar" ]]; then
+    mkdir -p /var/log/kolla/blazar
+fi
+if [[ $(stat -c %a /var/log/kolla/blazar) != "755" ]]; then
+    chmod 755 /var/log/kolla/blazar
+fi
+
+. /usr/local/bin/kolla_blazar_extend_start
diff --git a/docker/blazar/blazar-manager/Dockerfile.j2 b/docker/blazar/blazar-manager/Dockerfile.j2
new file mode 100644
index 000000000..01aca3d82
--- /dev/null
+++ b/docker/blazar/blazar-manager/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}blazar-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block blazar_manager_header %}{% endblock %}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% endif %}
+
+{% block blazar_manager_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER blazar