diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-23 14:11:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-23 14:11:58 +0000 |
| commit | cda1406c19b560e8c21c70633de525b4ab341278 (patch) | |
| tree | 2eaf88c6e37aee46cfa4209f02b0a11997b6b0ac /docker | |
| parent | 0e47c4413357e8821c38c50ab4fba2af74307217 (diff) | |
| parent | dfe72847f4f011918b0d68c7cff0a3fa20585cf1 (diff) | |
| download | kolla-cda1406c19b560e8c21c70633de525b4ab341278.tar.gz kolla-cda1406c19b560e8c21c70633de525b4ab341278.zip | |
Merge "Add vitrage images"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/vitrage/vitrage-api/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-base/Dockerfile.j2 | 30 | ||||
| -rwxr-xr-x | docker/vitrage/vitrage-base/extend_start.sh | 12 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-graph/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-notifier/Dockerfile.j2 | 16 |
5 files changed, 90 insertions, 0 deletions
diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 new file mode 100644 index 000000000..929db5ae4 --- /dev/null +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -0,0 +1,16 @@ +FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block vitrage_api_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block vitrage_api_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER vitrage diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 new file mode 100644 index 000000000..7507111f5 --- /dev/null +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -0,0 +1,30 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block vitrage_base_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='vitrage') }} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% elif install_type == 'source' %} + +ADD vitrage-base-archive /vitrage-base-source +RUN ln -s vitrage-base-source/* vitrage \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /vitrage \ + && mkdir -p /etc/vitrage \ + && cp -r /vitrage/etc/vitrage/* /etc/vitrage/ \ + && chown -R vitrage: /etc/vitrage + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN chmod 755 /usr/local/bin/kolla_extend_start + +{% block vitrage_base_footer %}{% endblock %} diff --git a/docker/vitrage/vitrage-base/extend_start.sh b/docker/vitrage/vitrage-base/extend_start.sh new file mode 100755 index 000000000..d79635057 --- /dev/null +++ b/docker/vitrage/vitrage-base/extend_start.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +VITRAGE_LOG_DIR="/var/log/kolla/vitrage" +if [[ ! -d "${VITRAGE_LOG_DIR}" ]]; then + mkdir -p ${VITRAGE_LOG_DIR} +fi +if [[ $(stat -c %U:%G ${VITRAGE_LOG_DIR}) != "vitrage:kolla" ]]; then + chown vitrage:kolla ${VITRAGE_LOG_DIR} +fi +if [[ $(stat -c %a ${VITRAGE_LOG_DIR}) != "755" ]]; then + chmod 755 ${VITRAGE_LOG_DIR} +fi diff --git a/docker/vitrage/vitrage-graph/Dockerfile.j2 b/docker/vitrage/vitrage-graph/Dockerfile.j2 new file mode 100644 index 000000000..412063fcd --- /dev/null +++ b/docker/vitrage/vitrage-graph/Dockerfile.j2 @@ -0,0 +1,16 @@ +FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block vitrage_graph_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block vitrage_graph_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER vitrage diff --git a/docker/vitrage/vitrage-notifier/Dockerfile.j2 b/docker/vitrage/vitrage-notifier/Dockerfile.j2 new file mode 100644 index 000000000..8b699de78 --- /dev/null +++ b/docker/vitrage/vitrage-notifier/Dockerfile.j2 @@ -0,0 +1,16 @@ +FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block vitrage_notifier_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block vitrage_notifier_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER vitrage |
