aboutsummaryrefslogtreecommitdiff
path: root/docker/watcher
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-21 18:21:42 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2022-04-21 18:53:14 +0000
commite21aeb5ae955671937055baf57836120af8d4312 (patch)
treec3a7bd5ab525f37e8b7a1d9f01864ab065e0ca05 /docker/watcher
parent08b80e34dae0236e6b106e7debcdb755508fe1d9 (diff)
downloadkolla-e21aeb5ae955671937055baf57836120af8d4312.tar.gz
kolla-e21aeb5ae955671937055baf57836120af8d4312.zip
flatten images a bit
As we have one type of images now some RUN calls could be merged so we will have less layers in resulting images. Change-Id: I5178c58fbd8c65efe825dc249c0f1368ef0fe8e0
Diffstat (limited to 'docker/watcher')
-rw-r--r--docker/watcher/watcher-base/Dockerfile.j29
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2
index c4feea2bc..aae288e56 100644
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ b/docker/watcher/watcher-base/Dockerfile.j2
@@ -16,15 +16,14 @@ ADD watcher-base-archive /watcher-base-source
'/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/ \
- && chown -R watcher: /etc/watcher
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_watcher_extend_start \
+ && chown -R 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
{% block watcher_base_footer %}{% endblock %}