aboutsummaryrefslogtreecommitdiff
path: root/docker/tacker
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/tacker
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/tacker')
-rw-r--r--docker/tacker/tacker-base/Dockerfile.j29
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2
index bce2af931..f9f526f6d 100644
--- a/docker/tacker/tacker-base/Dockerfile.j2
+++ b/docker/tacker/tacker-base/Dockerfile.j2
@@ -21,6 +21,8 @@ ADD plugins-archive /
'/plugins/*'
] %}
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
RUN ln -s tacker-base-source/* tacker \
&& {{ macros.install_pip(tacker_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/tacker \
@@ -28,11 +30,8 @@ RUN ln -s tacker-base-source/* tacker \
&& chown -R tacker: /etc/tacker \
&& if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \
- fi
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_tacker_extend_start \
+ fi \
+ && touch /usr/local/bin/kolla_tacker_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_tacker_extend_start
{% block tacker_base_footer %}{% endblock %}