diff options
Diffstat (limited to 'kolla/docker/watcher')
| -rw-r--r-- | kolla/docker/watcher/watcher-api/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | kolla/docker/watcher/watcher-api/extend_start.sh | 8 | ||||
| -rw-r--r-- | kolla/docker/watcher/watcher-applier/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | kolla/docker/watcher/watcher-base/Dockerfile.j2 | 29 | ||||
| -rw-r--r-- | kolla/docker/watcher/watcher-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | kolla/docker/watcher/watcher-engine/Dockerfile.j2 | 15 |
6 files changed, 95 insertions, 0 deletions
diff --git a/kolla/docker/watcher/watcher-api/Dockerfile.j2 b/kolla/docker/watcher/watcher-api/Dockerfile.j2 new file mode 100644 index 000000000..f31b53ecf --- /dev/null +++ b/kolla/docker/watcher/watcher-api/Dockerfile.j2 @@ -0,0 +1,18 @@ +FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" +{% endblock %} + +{% block watcher_api_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start +RUN chmod 644 /usr/local/bin/kolla_watcher_extend_start + +{{ macros.kolla_patch_sources() }} + +{% block watcher_api_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER watcher diff --git a/kolla/docker/watcher/watcher-api/extend_start.sh b/kolla/docker/watcher/watcher-api/extend_start.sh new file mode 100644 index 000000000..629ea6355 --- /dev/null +++ b/kolla/docker/watcher/watcher-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 + watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade + exit 0 +fi diff --git a/kolla/docker/watcher/watcher-applier/Dockerfile.j2 b/kolla/docker/watcher/watcher-applier/Dockerfile.j2 new file mode 100644 index 000000000..db28d81d9 --- /dev/null +++ b/kolla/docker/watcher/watcher-applier/Dockerfile.j2 @@ -0,0 +1,15 @@ +FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" +{% endblock %} + +{% block watcher_applier_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.kolla_patch_sources() }} + +{% block watcher_applier_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER watcher diff --git a/kolla/docker/watcher/watcher-base/Dockerfile.j2 b/kolla/docker/watcher/watcher-base/Dockerfile.j2 new file mode 100644 index 000000000..8de6ceb9d --- /dev/null +++ b/kolla/docker/watcher/watcher-base/Dockerfile.j2 @@ -0,0 +1,29 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" +{% endblock %} + +{% block watcher_base_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='watcher') }} + +ADD watcher-base-archive /watcher-base-source + +{% set watcher_base_pip_packages = [ + '/watcher' +] %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN ln -s watcher-base-source/* watcher \ + && {{ macros.install_pip(watcher_base_pip_packages | customizable("pip_packages")) }} \ + && mkdir -p /etc/watcher \ + && cp -r /watcher/etc/watcher/* /etc/watcher/ \ + && touch /usr/local/bin/kolla_watcher_extend_start \ + && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start + +{{ macros.kolla_patch_sources() }} + +{% block watcher_base_footer %}{% endblock %} diff --git a/kolla/docker/watcher/watcher-base/extend_start.sh b/kolla/docker/watcher/watcher-base/extend_start.sh new file mode 100644 index 000000000..9e27a9cf0 --- /dev/null +++ b/kolla/docker/watcher/watcher-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/watcher" ]]; then + mkdir -p /var/log/kolla/watcher +fi +if [[ $(stat -c %a /var/log/kolla/watcher) != "755" ]]; then + chmod 755 /var/log/kolla/watcher +fi + +. /usr/local/bin/kolla_watcher_extend_start diff --git a/kolla/docker/watcher/watcher-engine/Dockerfile.j2 b/kolla/docker/watcher/watcher-engine/Dockerfile.j2 new file mode 100644 index 000000000..2518a92b6 --- /dev/null +++ b/kolla/docker/watcher/watcher-engine/Dockerfile.j2 @@ -0,0 +1,15 @@ +FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" +{% endblock %} + +{% block watcher_engine_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.kolla_patch_sources() }} + +{% block watcher_engine_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER watcher |
