aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-09 15:12:00 +0000
committerGerrit Code Review <review@openstack.org>2017-11-09 15:12:00 +0000
commit514bdec3332a42a359177e520b97444aa9c6a39e (patch)
treea103db0166835779c018e59eae0131ca8482909f /docker
parent843b62649fca77bb4cec07282190d40c6ea9d93d (diff)
parentb8f7693d41bcdef7f6f0af96f9fb31b74e7c7204 (diff)
downloadkolla-514bdec3332a42a359177e520b97444aa9c6a39e.tar.gz
kolla-514bdec3332a42a359177e520b97444aa9c6a39e.zip
Merge "Implement Almanach Docker images"
Diffstat (limited to 'docker')
-rw-r--r--docker/almanach/almanach-api/Dockerfile.j216
-rw-r--r--docker/almanach/almanach-base/Dockerfile.j234
-rw-r--r--docker/almanach/almanach-base/extend_start.sh8
-rw-r--r--docker/almanach/almanach-collector/Dockerfile.j216
4 files changed, 74 insertions, 0 deletions
diff --git a/docker/almanach/almanach-api/Dockerfile.j2 b/docker/almanach/almanach-api/Dockerfile.j2
new file mode 100644
index 000000000..d1075ee6d
--- /dev/null
+++ b/docker/almanach/almanach-api/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}almanach-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block almanach_api_header %}{% endblock %}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+ && /bin/false
+
+{% endif %}
+
+{% block almanach_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER almanach
diff --git a/docker/almanach/almanach-base/Dockerfile.j2 b/docker/almanach/almanach-base/Dockerfile.j2
new file mode 100644
index 000000000..3a55f775b
--- /dev/null
+++ b/docker/almanach/almanach-base/Dockerfile.j2
@@ -0,0 +1,34 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block almanach_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='almanach') }}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+ && /bin/false
+
+{% elif install_type == 'source' %}
+
+ADD almanach-base-archive /almanach-base-source
+
+{% set almanach_base_pip_packages = [
+ '/almanach'
+] %}
+
+RUN ln -s almanach-base-source/* almanach \
+ && {{ macros.install_pip(almanach_base_pip_packages | customizable("pip_packages")) }} \
+ && mkdir -p /etc/almanach \
+ && chown -R almanach: /etc/almanach
+
+{% endif %}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN chmod 755 /usr/local/bin/kolla_extend_start
+
+{% block almanach_base_footer %}{% endblock %}
diff --git a/docker/almanach/almanach-base/extend_start.sh b/docker/almanach/almanach-base/extend_start.sh
new file mode 100644
index 000000000..a4ffb9fe9
--- /dev/null
+++ b/docker/almanach/almanach-base/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/almanach" ]]; then
+ mkdir -p /var/log/kolla/almanach
+fi
+if [[ $(stat -c %a /var/log/kolla/almanach) != "755" ]]; then
+ chmod 755 /var/log/kolla/almanach
+fi
diff --git a/docker/almanach/almanach-collector/Dockerfile.j2 b/docker/almanach/almanach-collector/Dockerfile.j2
new file mode 100644
index 000000000..ae66a7c14
--- /dev/null
+++ b/docker/almanach/almanach-collector/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}almanach-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block almanach_collector_header %}{% endblock %}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+ && /bin/false
+
+{% endif %}
+
+{% block almanach_collector_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER almanach