From b9a2839da80055d869e1e48f877bdf91c0b5dd0c Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Sat, 6 Aug 2016 11:16:34 +0200
Subject: [PATCH] Customizations for Watcher
This patchset contains customization of Dockerfile of Watcher
containers
Change-Id: I4d3f2af3e1d622b94d20f3d1f48a972afcff81b8
Partially-implements: blueprint third-party-plugin-support
Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
---
docker/watcher/watcher-api/Dockerfile.j2 | 2 ++
docker/watcher/watcher-applier/Dockerfile.j2 | 2 ++
docker/watcher/watcher-base/Dockerfile.j2 | 4 ++++
docker/watcher/watcher-engine/Dockerfile.j2 | 2 ++
4 files changed, 10 insertions(+)
diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2
index fadf5ea035..d428f69d4d 100644
--- a/docker/watcher/watcher-api/Dockerfile.j2
+++ b/docker/watcher/watcher-api/Dockerfile.j2
@@ -11,6 +11,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start
RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start
+{% block watcher_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
USER watcher
diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2
index dec6cff26f..a3469103c0 100644
--- a/docker/watcher/watcher-applier/Dockerfile.j2
+++ b/docker/watcher/watcher-applier/Dockerfile.j2
@@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% endif %}
+{% block watcher_applier_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
USER watcher
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2
index f6f86ddf9b..5e475f5629 100644
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ b/docker/watcher/watcher-base/Dockerfile.j2
@@ -25,3 +25,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN usermod -a -G kolla watcher \
&& touch /usr/local/bin/kolla_watcher_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start
+
+{% block watcher_base_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+{{ include_footer }}
diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2
index dec6cff26f..bae251c92e 100644
--- a/docker/watcher/watcher-engine/Dockerfile.j2
+++ b/docker/watcher/watcher-engine/Dockerfile.j2
@@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% endif %}
+{% block watcher_engine_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
USER watcher
--
GitLab